futex: Require sys_futex_requeue() to have identical flags

[ Upstream commit 19f94b39058681dec64a10ebeb6f23fe7fc3f77a ]

Nicholas reported that his LLM found it was possible to create a UaF
when sys_futex_requeue() is used with different flags. The initial
motivation for allowing different flags was the variable sized futex,
but since that hasn't been merged (yet), simply mandate the flags are
identical, as is the case for the old style sys_futex() requeue
operations.

Fixes: 0f4b5f972216 ("futex: Add sys_futex_requeue()")
Reported-by: Nicholas Carlini <npc@anthropic.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/kernel/futex/syscalls.c b/kernel/futex/syscalls.c
index 880c9bf2f315040c427f6b17f72ef2844d45861b..99723189c8cf70869efd76abaac8b156054fcc91 100644 (file)
--- a/kernel/futex/syscalls.c
+++ b/kernel/futex/syscalls.c
@@ -459,6 +459,14 @@ SYSCALL_DEFINE4(futex_requeue,
        if (ret)
                return ret;
 
+       /*
+        * For now mandate both flags are identical, like the sys_futex()
+        * interface has. If/when we merge the variable sized futex support,
+        * that patch can modify this test to allow a difference in size.
+        */
+       if (futexes[0].w.flags != futexes[1].w.flags)
+               return -EINVAL;
+
        cmpval = futexes[0].w.val;
 
        return futex_requeue(u64_to_user_ptr(futexes[0].w.uaddr), futexes[0].w.flags,