From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x225lmN0qSKyLVYASVAc4fysN+UjZYlodfcGrzI4fxNWPoXalasjD9ROAoRJo0y9IVogJuQ1t ARC-Seal: i=1; a=rsa-sha256; t=1516610896; cv=none; d=google.com; s=arc-20160816; b=DdTZpC+mkR4oiV/xmu6OtFY9yPVIpia2R0atLbsy6s0EIfsKwKq1KLwPejzEGAsQMp OFcbOg5HoBHLEpX1g24u6K9TgjVcjAd/Wr+fBDHGad0vPV1ZLUhLDZvkd8mJNSvnDBDl kRZ72ILeMqXybV9ck0qYgMnPpZ7AQgK0hHp6cORe4Y3p1yEV3TVMOnVtJz3dYiIYELDI qUYAtneViWjdEoAP2nnXY0QX3l0Osg6N5eetVusoxF4ANRk6fbBEHzRLrfTiQVnhPOJe 3tLKjUbXcUlKsz2tlBily3XVmqXI5JqrODhO3XqIdSB56+AzeDJQgTKtwg7yCOFy6/0L ZAeQ== 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=b/TwEgNwa8gisrGUkNCDWf2VsFQfP7NR6kv04Wb6emE=; b=Fdd8EzKMdatUCzuXziBnj5LaqGDJlK8mfL6WOVRUjeKd2TCUIEJu7QxmZ0am2p82lb elEKmmYUz3JvhbwpA2Ut5oLO+zlt5IhSbFHuHvn5D8TqsGM7afuQ4Nsk88gZU7y2JgXu PdDqS3qpKEVGz9j4vbKVc3l6pASsrLJJIjMXgdHk+9JbLjQRDUq4jCExzwfDRAfsurS3 DC4MParrd7L7YOCBUczExyNlH9+Y1G0geVZ2A7lYHy5XiYp/EACShYNwrF3HgaGKBJ/L HWpaH9Db8noEOKBNRVALmnnraMS619Ns6QElQICaan+AHRv3sGvuhIXzvq26HFuEsUvV 7XKQ== 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 4.9 03/47] futex: Prevent overflow by strengthen input validation Date: Mon, 22 Jan 2018 09:45:14 +0100 Message-Id: <20180122083925.875842727@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083925.568134913@linuxfoundation.org> References: <20180122083925.568134913@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?1590281365405131555?= X-GMAIL-MSGID: =?utf-8?q?1590281788268423674?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-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 @@ -1711,6 +1711,9 @@ static int futex_requeue(u32 __user *uad struct futex_q *this, *next; WAKE_Q(wake_q); + if (nr_wake < 0 || nr_requeue < 0) + return -EINVAL; + if (requeue_pi) { /* * Requeue PI only works on two distinct uaddrs. This