* [PATCH 2/2] [v3] mm/mempolicy: replace copy_nodes_to_user() interface with put_nodes()
2026-11-20 18:52 [PATCH 1/2] [v3] mm/mempolicy: fix copy_nodes_to_user() for odd inputs Arnd Bergmann
@ 2026-11-20 18:52 ` Arnd Bergmann
0 siblings, 0 replies; 2+ messages in thread
From: Arnd Bergmann @ 2026-11-20 18:52 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), Johannes Weiner, linux-mm
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, and restructure it for readability.
Suggested-by: David Hildenbrand (Arm) <david@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
mm/mempolicy.c | 48 +++++++++++++++++++++++++++++-------------------
1 file changed, 29 insertions(+), 19 deletions(-)
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index afe614efb77c..b240acaa8cf1 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1736,7 +1736,9 @@ 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;
+ /* User space passes the number of bits plus 1. Fix that up. */
+ maxnode -= 1;
+
nodes_clear(*nodes);
if (maxnode == 0 || !nmask)
return 0;
@@ -1769,31 +1771,39 @@ 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();
+ const bool compat = in_compat_syscall();
+ const unsigned int word_bits = compat ? BITS_PER_COMPAT_LONG : BITS_PER_LONG;
+ unsigned long bits, node_bits;
- if (compat) {
- copy = ALIGN(maxnode-1, BITS_PER_COMPAT_LONG) / 8;
- nbytes = BITS_TO_COMPAT_LONGS(nr_node_ids) * sizeof(compat_long_t);
- }
+ /* User space passes the number of bits plus 1. Fix that up. */
+ maxnode -= 1;
- if (copy > nbytes) {
- if (copy > PAGE_SIZE)
- return -EINVAL;
- if (clear_user((char __user *)mask + nbytes, copy - nbytes))
+ /* Don't exceed what would fit into a single page. */
+ if (maxnode > PAGE_SIZE * BITS_PER_BYTE)
+ return -EINVAL;
+
+ /* Process full words, which depend on the user space ABI. */
+ bits = ALIGN(maxnode, word_bits);
+ node_bits = ALIGN(nr_node_ids, word_bits);
+
+ /* Clear anything we won't copy below. */
+ if (bits > node_bits) {
+ if (clear_user((char __user *)mask + node_bits / BITS_PER_BYTE,
+ (bits - node_bits) / BITS_PER_BYTE))
return -EFAULT;
- copy = nbytes;
+ bits = node_bits;
}
+ /* Finally, copy the bitmap. */
if (compat)
return compat_put_bitmap((compat_ulong_t __user *)mask,
- nodes_addr(*nodes), copy * 8);
-
- return copy_to_user(mask, nodes_addr(*nodes), copy) ? -EFAULT : 0;
+ nodes_addr(*nodes), bits);
+ if (copy_to_user(mask, nodes_addr(*nodes), bits / BITS_PER_BYTE))
+ return -EFAULT;
+ return 0;
}
/* Basic parameter sanity check used by both mbind() and set_mempolicy() */
@@ -2054,7 +2064,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] 2+ messages in thread