From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226y3iWBcshCV8hP0wz+wGapLOwssi6m1u+d7UyJmK2pXt9/RH8APVwo3EfzU4dVdGqn076W ARC-Seal: i=1; a=rsa-sha256; t=1517256258; cv=none; d=google.com; s=arc-20160816; b=kqolN8OCJ4qDWEKAFux5lBi+2aC7+LCGs3qZgFf04CaxI6BW5drx6Ik4H2s4+hdtWk wJzcharSVHdE+eP2ua9Z/GrBq6OvtoW+ejAE5zuiYHOFic5y5etM51yKu7ycojaScF+c cwOrSuAyBErS5iwxiNyJuzxcku1zzEWIDYTHhyhn/EwQ5Zrircf7rDQ65mXmVIezEFZA GAmXvFLexKKrJ9kfwQ6jYHQBt3/gKXeBfQPkzwOLUR+1iEFJyCTyZXfWLRn8pxIXro45 oEeQLIcssA8oT5TPsNMkyqqkDlfe8DlE2c5huwMrznuuFWEG82rQxSszWiznwRoGvdFS XU1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=nhTNrmIh/x/nPso8ellzpIC6f5iLoPIeY3y8is9E85A=; b=BsH0yU/u/QYqlrBAYyFJ6P5xf90b/VjauAzkDdBY3Tmdh6vQlQG9W1R7HyAN4KCa+8 8HS7kdWt/hniGF0WxbKRtyunwbIub5BYmmaEI1LWmMBQfsg1v9zTyT0tvUcmIM24cT7o kB5iVoSxVqW7F1oR1PtkrkGl6rTR8VXWEWL+2G429afRB279SQOg5GsZ2ykDGJDPSbMV wDwskI6JZrmAbuAzU8w3BvKXf+MSIUrBQYpD1bCjQ0FjZA+4940l4FshiWLRLkcdXMna aCVUzSzF3gBxFK0eIoYy0mahYSZXaAsL2+ey1+OSKfqisc6fcpmqk98A5h/Bm8W6IEos 7hzw== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Li Jinyue , Thomas Gleixner , peterz@infradead.org, dvhart@infradead.org Subject: [PATCH 3.18 03/52] futex: Prevent overflow by strengthen input validation Date: Mon, 29 Jan 2018 13:56:21 +0100 Message-Id: <20180129123628.335983248@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123628.168904217@linuxfoundation.org> References: <20180129123628.168904217@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590958498836993182?= X-GMAIL-MSGID: =?utf-8?q?1590958498836993182?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Li Jinyue commit fbe0e839d1e22d88810f3ee3e2f1479be4c0aa4a upstream. 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 Link: https://lkml.kernel.org/r/1513242294-31786-1-git-send-email-lijinyue@huawei.com Signed-off-by: Greg Kroah-Hartman --- kernel/futex.c | 3 +++ 1 file changed, 3 insertions(+) --- a/kernel/futex.c +++ b/kernel/futex.c @@ -1514,6 +1514,9 @@ static int futex_requeue(u32 __user *uad struct futex_hash_bucket *hb1, *hb2; struct futex_q *this, *next; + if (nr_wake < 0 || nr_requeue < 0) + return -EINVAL; + if (requeue_pi) { /* * Requeue PI only works on two distinct uaddrs. This