Commit fbe0e839 authored Dec 14, 2017 by Li Jinyue Committed by Thomas Gleixner Jan 14, 2018

futex: Prevent overflow by strengthen input validation



UBSAN reports signed integer overflow in kernel/futex.c:

 UBSAN: Undefined behaviour in kernel/futex.c:2041:18
 signed integer overflow:
 0 - -2147483648 cannot be represented in type 'int'

Add a sanity check to catch negative values of nr_wake and nr_requeue.

Signed-off-by: Li Jinyue <lijinyue@huawei.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: peterz@infradead.org
Cc: dvhart@infradead.org
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/1513242294-31786-1-git-send-email-lijinyue@huawei.com

parent c1e2f0ea

kernel/futex.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1878,6 +1878,9 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags,
		struct futex_q this, next;
		DEFINE_WAKE_Q(wake_q);

		if (nr_wake < 0 \|\| nr_requeue < 0)
		return -EINVAL;

		/*
		* When PI not supported: return -ENOSYS if requeue_pi is true,
		* consequently the compiler knows requeue_pi is always false past