linux-kernel - Re: [GIT PULL] MM updates for 6.12-rc1

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAMuHMdW-4_WvazciLPedP6R6XnEnHqsEh+3s7M5159zcmHit9w@mail.gmail.com>
Date: Sun, 22 Sep 2024 11:32:35 +0200
From: Geert Uytterhoeven <geert@...ux-m68k.org>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>, linux-mm@...ck.org, 
	mm-commits@...r.kernel.org, linux-kernel@...r.kernel.org, 
	Huang Ying <ying.huang@...el.com>, Thomas Gleixner <tglx@...utronix.de>
Subject: Re: [GIT PULL] MM updates for 6.12-rc1

Hi Andrew,

On Fri, Sep 20, 2024 at 11:34 AM Andrew Morton
<akpm@...ux-foundation.org> wrote:
> Linus, please merge this cycle's batch of MM updates, thanks.
>
> Conflicts which I'm seeing, along with their linux-next resolutions are
> as follows:

[...]

> kernel/resource.c, vs ea72ce5da228 ("x86/kaslr: Expose and use the end
> of the physical memory address space"):
> https://lkml.kernel.org/r/20240909100043.60668995@canb.auug.org.au

[...]

> A build fix for m68k is needed, vs ea72ce5da228 ("x86/kaslr: Expose and
> use the end of the physical memory address space").  See
> https://lkml.kernel.org/r/87ttenvw0i.fsf@yhuang6-desk2.ccr.corp.intel.com

Which is not sufficient, as kisskb reports for m68k:

    kernel/resource.c: In function ‘gfr_start’:
    ./include/linux/minmax.h:93:30: error: conversion from ‘long long
unsigned int’ to ‘resource_size_t’ {aka ‘unsigned int’} changes value
from ‘18446744073709551615’ to ‘4294967295’ [-Werror=overflow]

Due to

    #define PHYSMEM_END  (-1ULL)

not being correct on 32-bit without LPAE.
Presumably this should just take into account the actual size of
phys_addr_t. My head is too hazy after Vienna to send a patch now ;-)

I bisected this to 99185c10d5d9214d ("resource, kunit: add test case
for region_intersects()"),  but apparently the offending definition
was modified later in commits ea72ce5da22806d5 ("x86/kaslr:
Expose and use the end of the physical memory address space")
and 617a814f14b89142 ("Merge tag 'mm-stable-2024-09-20-02-31' of
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm").

> The following changes since commit 431c1646e1f86b949fa3685efc50b660a364c2b6:

[...]

> "resource: Fix region_intersects() vs add_memory_driver_managed()" from
> Huang Ying.  Fix a bug in region_intersects() for systems with CXL memory.

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@...ux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds