From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751972AbeANSI3 (ORCPT + 1 other); Sun, 14 Jan 2018 13:08:29 -0500 Received: from terminus.zytor.com ([65.50.211.136]:58059 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751425AbeANSI1 (ORCPT ); Sun, 14 Jan 2018 13:08:27 -0500 Date: Sun, 14 Jan 2018 10:07:16 -0800 From: tip-bot for Li Jinyue Message-ID: Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, lijinyue@huawei.com, hpa@zytor.com Reply-To: linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, lijinyue@huawei.com, hpa@zytor.com In-Reply-To: <1513242294-31786-1-git-send-email-lijinyue@huawei.com> References: <1513242294-31786-1-git-send-email-lijinyue@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/urgent] futex: Prevent overflow by strengthen input validation Git-Commit-ID: fbe0e839d1e22d88810f3ee3e2f1479be4c0aa4a X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Commit-ID: fbe0e839d1e22d88810f3ee3e2f1479be4c0aa4a Gitweb: https://git.kernel.org/tip/fbe0e839d1e22d88810f3ee3e2f1479be4c0aa4a Author: Li Jinyue AuthorDate: Thu, 14 Dec 2017 17:04:54 +0800 Committer: Thomas Gleixner CommitDate: Sun, 14 Jan 2018 18:55:03 +0100 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 Signed-off-by: Thomas Gleixner 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 --- kernel/futex.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/futex.c b/kernel/futex.c index 9e69589..8c5424d 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -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