[v1,04/14] futex: Validate futex value against futex size

Commit Message

Peter Zijlstra July 21, 2023, 10:22 a.m. UTC

Ensure the futex value fits in the given futex size. Since this adds a
constraint to an existing syscall, it might possibly change behaviour.

Currently the value would be truncated to a u32 and any high bits
would get silently lost.

Signed-off-by: Peter Zijlstra (Intel) <[e-mail]>
---
 kernel/futex/futex.h    |    8 ++++++++
 kernel/futex/syscalls.c |    3 +++
 2 files changed, 11 insertions(+)

Comments

Thomas Gleixner July 31, 2023, 5:12 p.m. UTC | #1

On Fri, Jul 21 2023 at 12:22, Peter Zijlstra wrote:
> +static inline bool futex_validate_input(unsigned int flags, u64 val)
> +{
> +	int bits = 8 * futex_size(flags);
> +	if (bits < 64 && (val >> bits))

New line between declaration and code. 

> +		return false;
> +	return true;
> +}

Other than that::

Reviewed-by: Thomas Gleixner <[e-mail]>

Patch

--- a/kernel/futex/futex.h
+++ b/kernel/futex/futex.h
@@ -86,6 +86,14 @@  static inline unsigned int futex_size(un
 	return 1 << size; /* {0,1,2,3} -> {1,2,4,8} */
 }
 
+static inline bool futex_validate_input(unsigned int flags, u64 val)
+{
+	int bits = 8 * futex_size(flags);
+	if (bits < 64 && (val >> bits))
+		return false;
+	return true;
+}
+
 #ifdef CONFIG_FAIL_FUTEX
 extern bool should_fail_futex(bool fshared);
 #else
--- a/kernel/futex/syscalls.c
+++ b/kernel/futex/syscalls.c
@@ -209,6 +209,9 @@  static int futex_parse_waitv(struct fute
 		if (!futex_flags_valid(flags))
 			return -EINVAL;
 
+		if (!futex_validate_input(flags, aux.val))
+			return -EINVAL;
+
 		futexv[i].w.flags = flags;
 		futexv[i].w.val = aux.val;
 		futexv[i].w.uaddr = aux.uaddr;