* [PATCH 1/2] [v2] mm/mempolicy: fix copy_nodes_to_user() for odd inputs
@ 2026-11-17 21:14 Arnd Bergmann
2026-11-17 21:14 ` [PATCH 2/2] [v2] mm/mempolicy: replace copy_nodes_to_user() interface with put_nodes() Arnd Bergmann
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Arnd Bergmann @ 2026-11-17 21:14 UTC (permalink / raw)
To: David Hildenbrand, Gregory Price, Andrew Morton, Arnd Bergmann
Cc: larips, stable, Zi Yan, Joshua Hahn, Rakie Kim, Ying Huang,
Lorenzo Stoakes (ARM), Brendan Jackman, Johannes Weiner,
Jackie Liu, linux-mm, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
The compat_put_bitmap() argument has an off-by-one error that leads to
copying an extra 32-bit word from the kernel stack to userspace when
called with an argument that is one larger than a 64-bit number.
In addition, the size calculation rounds up to multiples of 64 bits
instead of multiples of word size as documented in the man page and
expected by numactl.
Fix the calculation where needed to use the correct -1 offset
and pad as needed.
Reported-by: larips <larips950@gmail.com>
Reported-by: Gregory Price (Meta) <gourry@gourry.net>
Fixes: e130242dc351 ("mm: simplify compat numa syscalls")
Link: https://lore.kernel.org/all/20261117101910.1820066-1-gourry@gourry.net/
Cc: stable@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
v2: as Lorenzo pointed out, the off-by-one mistake is part of the ABI
and cannot change, we just have to use it consistently.
---
mm/mempolicy.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 6d662a9a8c74..e471ce615691 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1749,12 +1749,12 @@ static int get_nodes(nodemask_t *nodes, const unsigned long __user *nmask,
static int copy_nodes_to_user(unsigned long __user *mask, unsigned long maxnode,
nodemask_t *nodes)
{
- unsigned long copy = ALIGN(maxnode-1, 64) / 8;
+ unsigned long copy = ALIGN(maxnode-1, BITS_PER_LONG) / 8;
unsigned int nbytes = BITS_TO_LONGS(nr_node_ids) * sizeof(long);
bool compat = in_compat_syscall();
if (compat)
- nbytes = BITS_TO_COMPAT_LONGS(nr_node_ids) * sizeof(compat_long_t);
+ copy = ALIGN(maxnode-1, BITS_PER_COMPAT_LONG) / 8;
if (copy > nbytes) {
if (copy > PAGE_SIZE)
@@ -1762,12 +1762,12 @@ static int copy_nodes_to_user(unsigned long __user *mask, unsigned long maxnode,
if (clear_user((char __user *)mask + nbytes, copy - nbytes))
return -EFAULT;
copy = nbytes;
- maxnode = nr_node_ids;
+ maxnode = nr_node_ids+1;
}
if (compat)
return compat_put_bitmap((compat_ulong_t __user *)mask,
- nodes_addr(*nodes), maxnode);
+ nodes_addr(*nodes), maxnode-1);
return copy_to_user(mask, nodes_addr(*nodes), copy) ? -EFAULT : 0;
}
--
2.53.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] [v2] mm/mempolicy: replace copy_nodes_to_user() interface with put_nodes()
2026-11-17 21:14 [PATCH 1/2] [v2] mm/mempolicy: fix copy_nodes_to_user() for odd inputs Arnd Bergmann
@ 2026-11-17 21:14 ` Arnd Bergmann
2026-11-18 21:16 ` sashiko-bot
2026-11-18 3:09 ` [PATCH 1/2] [v2] mm/mempolicy: fix copy_nodes_to_user() for odd inputs Gregory Price (Meta)
2026-11-18 21:16 ` sashiko-bot
2 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2026-11-17 21:14 UTC (permalink / raw)
To: David Hildenbrand, Gregory Price, Andrew Morton
Cc: Arnd Bergmann, larips, stable, Zi Yan, Joshua Hahn, Rakie Kim,
Ying Huang, Lorenzo Stoakes (ARM), Brendan Jackman,
Johannes Weiner, Jackie Liu, linux-mm, linux-kernel, Kees Cook
From: Arnd Bergmann <arnd@arndb.de>
The get_nodes() function handles copying node masks from userspace, while
copy_nodes_to_user() copies the same masks to userspace, but with a
different argument order and slightly different meaning of the same
variables.
To make that less confusing, change copy_nodes_to_user() to look
more like get_nodes(), using similar name and arguments as well
as adjusting the maxnode value once, with a comment explaining it
in both places.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
mm/mempolicy.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index e471ce615691..bb18867ba41e 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1713,7 +1713,7 @@ static int get_bitmap(unsigned long *mask, const unsigned long __user *nmask,
static int get_nodes(nodemask_t *nodes, const unsigned long __user *nmask,
unsigned long maxnode)
{
- --maxnode;
+ --maxnode; /* user space ABI uses number of bits plus 1 */
nodes_clear(*nodes);
if (maxnode == 0 || !nmask)
return 0;
@@ -1746,15 +1746,18 @@ static int get_nodes(nodemask_t *nodes, const unsigned long __user *nmask,
}
/* Copy a kernel node mask to user space */
-static int copy_nodes_to_user(unsigned long __user *mask, unsigned long maxnode,
- nodemask_t *nodes)
+static int put_nodes(unsigned long __user *mask, nodemask_t *nodes,
+ unsigned long maxnode)
{
- unsigned long copy = ALIGN(maxnode-1, BITS_PER_LONG) / 8;
unsigned int nbytes = BITS_TO_LONGS(nr_node_ids) * sizeof(long);
bool compat = in_compat_syscall();
+ unsigned long copy;
+
+ --maxnode; /* user space ABI uses number of bits plus 1 */
+ copy = ALIGN(maxnode, BITS_PER_LONG) / 8;
if (compat)
- copy = ALIGN(maxnode-1, BITS_PER_COMPAT_LONG) / 8;
+ copy = ALIGN(maxnode, BITS_PER_COMPAT_LONG) / 8;
if (copy > nbytes) {
if (copy > PAGE_SIZE)
@@ -1762,12 +1765,12 @@ static int copy_nodes_to_user(unsigned long __user *mask, unsigned long maxnode,
if (clear_user((char __user *)mask + nbytes, copy - nbytes))
return -EFAULT;
copy = nbytes;
- maxnode = nr_node_ids+1;
+ maxnode = nr_node_ids;
}
if (compat)
return compat_put_bitmap((compat_ulong_t __user *)mask,
- nodes_addr(*nodes), maxnode-1);
+ nodes_addr(*nodes), maxnode);
return copy_to_user(mask, nodes_addr(*nodes), copy) ? -EFAULT : 0;
}
@@ -2030,7 +2033,7 @@ static int kernel_get_mempolicy(int __user *policy,
return -EFAULT;
if (nmask)
- err = copy_nodes_to_user(nmask, maxnode, &nodes);
+ err = put_nodes(nmask, &nodes, maxnode);
return err;
}
--
2.53.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] [v2] mm/mempolicy: fix copy_nodes_to_user() for odd inputs
2026-11-17 21:14 [PATCH 1/2] [v2] mm/mempolicy: fix copy_nodes_to_user() for odd inputs Arnd Bergmann
2026-11-17 21:14 ` [PATCH 2/2] [v2] mm/mempolicy: replace copy_nodes_to_user() interface with put_nodes() Arnd Bergmann
@ 2026-11-18 3:09 ` Gregory Price (Meta)
2026-11-18 21:16 ` sashiko-bot
2 siblings, 0 replies; 5+ messages in thread
From: Gregory Price (Meta) @ 2026-11-18 3:09 UTC (permalink / raw)
To: Arnd Bergmann
Cc: David Hildenbrand, Gregory Price, Andrew Morton, Arnd Bergmann,
larips, stable, Zi Yan, Joshua Hahn, Rakie Kim, Ying Huang,
Lorenzo Stoakes (ARM), Brendan Jackman, Johannes Weiner,
Jackie Liu, linux-mm, linux-kernel
On 2026-11-17 22:14 +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The compat_put_bitmap() argument has an off-by-one error that leads to
> copying an extra 32-bit word from the kernel stack to userspace when
> called with an argument that is one larger than a 64-bit number.
>
> In addition, the size calculation rounds up to multiples of 64 bits
> instead of multiples of word size as documented in the man page and
> expected by numactl.
>
> Fix the calculation where needed to use the correct -1 offset
> and pad as needed.
>
> Reported-by: larips <larips950@gmail.com>
> Reported-by: Gregory Price (Meta) <gourry@gourry.net>
> Fixes: e130242dc351 ("mm: simplify compat numa syscalls")
> Link: https://lore.kernel.org/all/20261117101910.1820066-1-gourry@gourry.net/
> Cc: stable@vger.kernel.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> v2: as Lorenzo pointed out, the off-by-one mistake is part of the ABI
> and cannot change, we just have to use it consistently.
> ---
> mm/mempolicy.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/mm/mempolicy.c b/mm/mempolicy.c
> index 6d662a9a8c74..e471ce615691 100644
> --- a/mm/mempolicy.c
> +++ b/mm/mempolicy.c
> @@ -1749,12 +1749,12 @@ static int get_nodes(nodemask_t *nodes, const unsigned long __user *nmask,
> static int copy_nodes_to_user(unsigned long __user *mask, unsigned long maxnode,
> nodemask_t *nodes)
> {
> - unsigned long copy = ALIGN(maxnode-1, 64) / 8;
> + unsigned long copy = ALIGN(maxnode-1, BITS_PER_LONG) / 8;
> unsigned int nbytes = BITS_TO_LONGS(nr_node_ids) * sizeof(long);
> bool compat = in_compat_syscall();
>
> if (compat)
> - nbytes = BITS_TO_COMPAT_LONGS(nr_node_ids) * sizeof(compat_long_t);
> + copy = ALIGN(maxnode-1, BITS_PER_COMPAT_LONG) / 8;
bleh this is such a mess to reason about.
Pretty sure you need to keep both of these lines:
if (compat) {
copy = ALIGN(maxnode, BITS_PER_COMPAT_LONG) / 8;
nbytes = BITS_TO_COMPAT_LONGS(nr_node_ids) * sizeof(compat_long_t);
}
Otherwise now we can get the opposite problem. If the buffer is longer
than nbytes, we'll write too few.
Test:
```
/* 32-bit get_mempolicy() leaves nodemask word 1 stale (needs <= 32 nodes). */
#include <stdio.h>
#include <string.h>
#include <sys/mman.h>
int main(void)
{
/* int $0x80 is a compat syscall: pointers must be below 4G */
unsigned int *m = mmap(0, 4096, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS | MAP_32BIT, -1, 0);
long ret;
memset(m, 0xa5, 4096);
/* i386 get_mempolicy(275)(&policy, mask, maxnode=1025, 0, MPOL_F_MEMS_ALLOWED) */
asm volatile("int $0x80" : "=a"(ret)
: "a"(275), "b"(m + 512), "c"(m), "d"(1025), "S"(0), "D"(4)
: "memory");
printf("ret=%ld word0=%08x word1=%08x -> %s\n", ret, m[0], m[1],
m[1] == 0xa5a5a5a5 ? "FAIL: word 1 stale" : "ok");
return m[1] == 0xa5a5a5a5;
}
```
base - word0=00000003 word1=00000000 -> ok
this patch - word0=00000003 word1=a5a5a5a5 -> FAIL
fix above - word0=00000003 word1=00000000 -> ok
--
~Gregory
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] [v2] mm/mempolicy: fix copy_nodes_to_user() for odd inputs
2026-11-17 21:14 [PATCH 1/2] [v2] mm/mempolicy: fix copy_nodes_to_user() for odd inputs Arnd Bergmann
2026-11-17 21:14 ` [PATCH 2/2] [v2] mm/mempolicy: replace copy_nodes_to_user() interface with put_nodes() Arnd Bergmann
2026-11-18 3:09 ` [PATCH 1/2] [v2] mm/mempolicy: fix copy_nodes_to_user() for odd inputs Gregory Price (Meta)
@ 2026-11-18 21:16 ` sashiko-bot
2 siblings, 0 replies; 5+ messages in thread
From: sashiko-bot @ 2026-11-18 21:16 UTC (permalink / raw)
To: Arnd Bergmann, David Hildenbrand, Gregory Price, Andrew Morton,
Arnd Bergmann
Cc: larips, Zi Yan, Joshua Hahn, Rakie Kim, Ying Huang,
Lorenzo Stoakes (ARM), Brendan Jackman, Johannes Weiner,
Jackie Liu, linux-mm
Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [High] mm/mempolicy: missing compat nbytes update in
copy_nodes_to_user()
--
commit 8559c85c3c122388b2f3048335523c715d5cc2db
Author: Arnd Bergmann <arnd@arndb.de>
mm/mempolicy: fix copy_nodes_to_user() for odd inputs
This commit fixes the copy size alignment and the maxnode off-by-one
calculation in copy_nodes_to_user() for native and compat callers.
Link: https://lore.kernel.org/all/20261117101910.1820066-1-gourry@gourry.net/
> diff --git a/mm/mempolicy.c b/mm/mempolicy.c
> index fb627b37afcbb..c10f9d4ba38f8 100644
> --- a/mm/mempolicy.c
> +++ b/mm/mempolicy.c
> @@ -1720,12 +1720,12 @@ static int get_nodes(nodemask_t *nodes, const unsigned long __user *nmask,
> static int copy_nodes_to_user(unsigned long __user *mask, unsigned long maxnode,
> nodemask_t *nodes)
> {
> - unsigned long copy = ALIGN(maxnode-1, 64) / 8;
> + unsigned long copy = ALIGN(maxnode-1, BITS_PER_LONG) / 8;
> unsigned int nbytes = BITS_TO_LONGS(nr_node_ids) * sizeof(long);
> bool compat = in_compat_syscall();
>
> if (compat)
> - nbytes = BITS_TO_COMPAT_LONGS(nr_node_ids) * sizeof(compat_long_t);
> + copy = ALIGN(maxnode-1, BITS_PER_COMPAT_LONG) / 8;
>
> if (copy > nbytes) {
> if (copy > PAGE_SIZE)
> @@ -1733,12 +1733,12 @@ static int copy_nodes_to_user(unsigned long __user *mask, unsigned long maxnode,
> if (clear_user((char __user *)mask + nbytes, copy - nbytes))
> return -EFAULT;
> copy = nbytes;
> - maxnode = nr_node_ids;
> + maxnode = nr_node_ids+1;
> }
>
> if (compat)
> return compat_put_bitmap((compat_ulong_t __user *)mask,
> - nodes_addr(*nodes), maxnode);
> + nodes_addr(*nodes), maxnode-1);
>
> return copy_to_user(mask, nodes_addr(*nodes), copy) ? -EFAULT : 0;
> }
[Severity: High]
Does replacing the compat nbytes assignment with the compat copy
assignment leave a 4-byte gap in the userspace nodemask when
BITS_TO_COMPAT_LONGS(nr_node_ids) is odd?
Without the compat nbytes update, nbytes stays a multiple of sizeof(long)
(e.g., 8 bytes when nr_node_ids <= 32). When a compat caller passes a
buffer with copy > nbytes, clear_user() zeroes starting at mask + nbytes
and maxnode is clamped to nr_node_ids + 1, but compat_put_bitmap() aligns
maxnode - 1 to BITS_PER_COMPAT_LONG and only writes
BITS_TO_COMPAT_LONGS(nr_node_ids) * sizeof(compat_long_t) bytes (4 bytes),
leaving the word at nbytes - sizeof(compat_long_t) untouched. When
copy == nbytes (e.g., 34 <= maxnode <= 65 with nr_node_ids <= 32),
copy > nbytes is false, so maxnode is not clamped and compat_put_bitmap()
copies the upper 32 bits of the kernel unsigned long instead of zeroing
that word.
It looks like the if (compat) block needs to set both nbytes and copy (the
follow-up commit "mm/mempolicy: use put_bitmap() instead of
copy_to_user()" has the same issue in put_nodes()).
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261117211635.2472067-1-arnd@kernel.org?part=1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] [v2] mm/mempolicy: replace copy_nodes_to_user() interface with put_nodes()
2026-11-17 21:14 ` [PATCH 2/2] [v2] mm/mempolicy: replace copy_nodes_to_user() interface with put_nodes() Arnd Bergmann
@ 2026-11-18 21:16 ` sashiko-bot
0 siblings, 0 replies; 5+ messages in thread
From: sashiko-bot @ 2026-11-18 21:16 UTC (permalink / raw)
To: Arnd Bergmann, David Hildenbrand, Gregory Price, Andrew Morton
Cc: Arnd Bergmann, larips, Zi Yan, Joshua Hahn, Rakie Kim, Ying Huang,
Lorenzo Stoakes (ARM), Brendan Jackman, Johannes Weiner,
Jackie Liu, linux-mm, Kees Cook
Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [High] mm/mempolicy: unadjusted nbytes for compat in put_nodes()
leaves 4-byte gap
--
commit 2830eda1a2add7e034fa70931e6090d2764cf894
Author: Arnd Bergmann <arnd@arndb.de>
mm/mempolicy: replace copy_nodes_to_user() interface with put_nodes()
This commit renames copy_nodes_to_user() to put_nodes(), reorders its
arguments to match get_nodes(), and decrements maxnode once at the start
of the function.
> diff --git a/mm/mempolicy.c b/mm/mempolicy.c
> index c10f9d4ba38f8..47bd36ac70787 100644
> --- a/mm/mempolicy.c
> +++ b/mm/mempolicy.c
[ ... ]
> @@ -1717,15 +1717,18 @@ static int get_nodes(nodemask_t *nodes, const unsigned long __user *nmask,
> }
>
> /* Copy a kernel node mask to user space */
> -static int copy_nodes_to_user(unsigned long __user *mask, unsigned long maxnode,
> - nodemask_t *nodes)
> +static int put_nodes(unsigned long __user *mask, nodemask_t *nodes,
> + unsigned long maxnode)
> {
> - unsigned long copy = ALIGN(maxnode-1, BITS_PER_LONG) / 8;
> unsigned int nbytes = BITS_TO_LONGS(nr_node_ids) * sizeof(long);
> bool compat = in_compat_syscall();
> + unsigned long copy;
> +
> + --maxnode; /* user space ABI uses number of bits plus 1 */
>
> + copy = ALIGN(maxnode, BITS_PER_LONG) / 8;
> if (compat)
> - copy = ALIGN(maxnode-1, BITS_PER_COMPAT_LONG) / 8;
> + copy = ALIGN(maxnode, BITS_PER_COMPAT_LONG) / 8;
>
> if (copy > nbytes) {
> if (copy > PAGE_SIZE)
> @@ -1733,12 +1736,12 @@ static int copy_nodes_to_user(unsigned long __user *mask, unsigned long maxnode,
> if (clear_user((char __user *)mask + nbytes, copy - nbytes))
> return -EFAULT;
> copy = nbytes;
> - maxnode = nr_node_ids+1;
> + maxnode = nr_node_ids;
> }
>
> if (compat)
> return compat_put_bitmap((compat_ulong_t __user *)mask,
> - nodes_addr(*nodes), maxnode-1);
> + nodes_addr(*nodes), maxnode);
[Severity: High]
Can this leave a 4-byte gap of uninitialized user memory in mask when
called from a 32-bit compat syscall?
nbytes is sized in unsigned long units (a multiple of 8 bytes on 64-bit
kernels) and is not adjusted for compat, whereas compat_put_bitmap()
rounds bitmap_size up to a 32-bit compat_ulong_t boundary:
kernel/compat.c:compat_put_bitmap() {
/* align bitmap up to nearest compat_long_t boundary */
bitmap_size = ALIGN(bitmap_size, BITS_PER_COMPAT_LONG);
nr_compat_longs = BITS_TO_COMPAT_LONGS(bitmap_size);
...
}
When nr_node_ids spans an odd number of 32-bit words (for example, 1 to
32 nodes, where nbytes is 8) and a compat caller passes a buffer with
copy > nbytes, clear_user() zeroes starting at mask + nbytes while
compat_put_bitmap() with maxnode = nr_node_ids writes only nbytes - 4
bytes, leaving the 4 bytes at [nbytes - 4, nbytes) untouched. In
addition, when maxnode is between 34 and 65 on such a system, copy is 8
(equal to nbytes), so the copy > nbytes check is skipped and maxnode is
not clamped to nr_node_ids.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261117211635.2472067-1-arnd@kernel.org?part=2
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2026-11-18 21:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-17 21:14 [PATCH 1/2] [v2] mm/mempolicy: fix copy_nodes_to_user() for odd inputs Arnd Bergmann
2026-11-17 21:14 ` [PATCH 2/2] [v2] mm/mempolicy: replace copy_nodes_to_user() interface with put_nodes() Arnd Bergmann
2026-11-18 21:16 ` sashiko-bot
2026-11-18 3:09 ` [PATCH 1/2] [v2] mm/mempolicy: fix copy_nodes_to_user() for odd inputs Gregory Price (Meta)
2026-11-18 21:16 ` sashiko-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox