mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Arnd Bergmann" <arnd@arndb.de>
To: "Lorenzo Stoakes" <ljs@kernel.org>, "Arnd Bergmann" <arnd@kernel.org>
Cc: "David Hildenbrand (Red Hat)" <david@kernel.org>,
	"Gregory Price" <gourry@gourry.net>,
	"Andrew Morton" <akpm@linux-foundation.org>,
	larips <larips950@gmail.com>,
	stable@vger.kernel.org, "Zi Yan" <ziy@nvidia.com>,
	"Joshua Hahn" <joshua.hahnjy@gmail.com>,
	"Rakie Kim" <rakie.kim@sk.com>,
	"Ying Huang" <ying.huang@linux.alibaba.com>,
	"Brendan Jackman" <brendan.jackman@linux.dev>,
	"Johannes Weiner" <hannes@cmpxchg.org>,
	"Jackie Liu" <liuyun01@kylinos.cn>,
	linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] mm/mempolicy: fix copy_nodes_to_user() for odd inputs
Date: Tue, 17 Nov 2026 16:26:48 +0100	[thread overview]
Message-ID: <541a67af-3b45-4d5d-ac4b-c741850f92e1@app.fastmail.com> (raw)
In-Reply-To: <avxnIQTcFni9G4IN@gremlin>

On Tue, Nov 17, 2026, at 15:59, Lorenzo Stoakes (ARM) wrote:
> On Tue, Nov 17, 2026 at 03:25:53PM +0100, Arnd Bergmann wrote:
>> From: Arnd Bergmann <arnd@arndb.de>
>> For compat syscalls, the effect is worse, as the actual calculation for
>> the size does include the extra word, but the check for the input size
>> does not take it into account and can leak a word of stack data.
>>
>> 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.
>>
>> Fortunately numactl always passes multiples of 64 here, so none of
>
> (Claude) went looking at numactl source (e.g. via libnuma) and it seems it
> passes size + 1 matching the convention?

Ok, I see it now as well. The man page again says "maxnode specifies
the number of node IDs that can be stored into  nodemask——that is,
the maximum node ID plus one.", which I'd naïvely interpret as meaning
that a system with 64 nodes would have a "maximum node ID" of 63 and
require passing one more (64), but clearly the implementation on
both sides expects a 65 here.

>> diff --git a/mm/mempolicy.c b/mm/mempolicy.c
>> index 6d662a9a8c74..f318e1155770 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, BITS_PER_LONG) / 8;
>
> This looks like it'll be broken given the convention of passing bits + 1,
> e.g. ALIGN(1025, 64) / 8 != ALIGN(1024, 64) / 8.
>
> Then later that could case a buffer overflow potentially?

Right, this would then overflow the user buffer.

> Overall it seems the issue is that e130242dc351 (understandably!) passes maxnode
> rather than maxnode-1.
>
> So a really small fixup would be something like:
>
> diff --git a/mm/mempolicy.c b/mm/mempolicy.c
> index fb627b37afcb..051d411c04ee 100644
> --- a/mm/mempolicy.c
> +++ b/mm/mempolicy.c
> @@ -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;
>  }
>
> Maybe doing that's the easiest route for this?

I would still try to fix the other mistakes (aligning to 64 instead
of BITS_PER_LONG/BITS_PER_COMPAT_LONG and the incorrect nbytes).
Maybe it's clearer to just pass the adjusted maxnode into the
function directly and keep that extra '-1' in one place?

     Arnd

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 6d662a9a8c74..931194421c4f 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, 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, BITS_PER_COMPAT_LONG) / 8;
 
 	if (copy > nbytes) {
 		if (copy > PAGE_SIZE)
@@ -2030,7 +2030,7 @@ static int kernel_get_mempolicy(int __user *policy,
 		return -EFAULT;
 
 	if (nmask)
-		err = copy_nodes_to_user(nmask, maxnode, &nodes);
+		err = copy_nodes_to_user(nmask, maxnode-1, &nodes);
 
 	return err;
 }

  reply	other threads:[~2026-11-17 15:28 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17 14:25 Arnd Bergmann
2026-11-17 14:59 ` Lorenzo Stoakes (ARM)
2026-11-17 15:26   ` Arnd Bergmann [this message]
2026-11-17 15:36     ` Lorenzo Stoakes (ARM)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=541a67af-3b45-4d5d-ac4b-c741850f92e1@app.fastmail.com \
    --to=arnd@arndb.de \
    --cc=akpm@linux-foundation.org \
    --cc=arnd@kernel.org \
    --cc=brendan.jackman@linux.dev \
    --cc=david@kernel.org \
    --cc=gourry@gourry.net \
    --cc=hannes@cmpxchg.org \
    --cc=joshua.hahnjy@gmail.com \
    --cc=larips950@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=liuyun01@kylinos.cn \
    --cc=ljs@kernel.org \
    --cc=rakie.kim@sk.com \
    --cc=stable@vger.kernel.org \
    --cc=ying.huang@linux.alibaba.com \
    --cc=ziy@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®