summaryrefslogtreecommitdiffstats
path: root/kernel/futex
diff options
context:
space:
mode:
authorpeterz@infradead.org <peterz@infradead.org>2023-09-21 12:45:07 +0200
committerPeter Zijlstra <peterz@infradead.org>2023-09-21 19:22:05 +0200
commitd6d08d24790e82c69a46ef78ae44fe1b1ed30775 (patch)
treef26d08ae2ae9576b64c6f1fccd7ab0e6fee78ef8 /kernel/futex
parentfutex: Clarify FUTEX2 flags (diff)
downloadlinux-d6d08d24790e82c69a46ef78ae44fe1b1ed30775.tar.xz
linux-d6d08d24790e82c69a46ef78ae44fe1b1ed30775.zip
futex: Extend the FUTEX2 flags
Add the definition for the missing but always intended extra sizes, and add a NUMA flag for the planned numa extention. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: André Almeida <andrealmeid@igalia.com> Link: https://lore.kernel.org/r/20230921105247.617057368@noisy.programming.kicks-ass.net
Diffstat (limited to 'kernel/futex')
-rw-r--r--kernel/futex/syscalls.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/kernel/futex/syscalls.c b/kernel/futex/syscalls.c
index ff696b0e2e5c..953f0a49de3a 100644
--- a/kernel/futex/syscalls.c
+++ b/kernel/futex/syscalls.c
@@ -183,7 +183,7 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
return do_futex(uaddr, op, val, tp, uaddr2, (unsigned long)utime, val3);
}
-#define FUTEX2_VALID_MASK (FUTEX2_SIZE_U32 | FUTEX2_PRIVATE)
+#define FUTEX2_VALID_MASK (FUTEX2_SIZE_MASK | FUTEX2_PRIVATE)
/**
* futex_parse_waitv - Parse a waitv array from userspace
@@ -207,7 +207,12 @@ static int futex_parse_waitv(struct futex_vector *futexv,
if ((aux.flags & ~FUTEX2_VALID_MASK) || aux.__reserved)
return -EINVAL;
- if (!(aux.flags & FUTEX2_SIZE_U32))
+ if (!IS_ENABLED(CONFIG_64BIT) || in_compat_syscall()) {
+ if ((aux.flags & FUTEX2_SIZE_MASK) == FUTEX2_SIZE_U64)
+ return -EINVAL;
+ }
+
+ if ((aux.flags & FUTEX2_SIZE_MASK) != FUTEX2_SIZE_U32)
return -EINVAL;
futexv[i].w.flags = aux.flags;