[PATCH 2/2] [v2] mm/mempolicy: replace copy_nodes_to_user() interface with put_nodes()
From: Arnd Bergmann
Date: Tue Nov 17 2026 - 16:16:57 EST
From: Arnd Bergmann <arnd@xxxxxxxx>
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@xxxxxxxx>
---
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