From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-4036635-1516887929-2-9981004867550734413 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='cz', MailFrom='org' X-Spam-charsets: plain='utf-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516887929; b=EtaMU+8aDw5TDr3kZJbKNqDF0Ux1ltgCDRIiRnENdylK3O6 BSdjDqg8Rb29XHpB0I+niYPRLCmgUukasid/s2mTt5fMsDnBJC8Mp3a4UjZmswh0 nBCuacfWPK7K8Uhu4QXO/8zn/gl2/CCPp2XpY/n3ivmMOQhGeyDjpG1AgkBtZmL2 hb6XeadeAdLxAwP6IgGDvcxtxSbrO6y6IEJE62l/ManKOpNSdP7eHg0+5NHoLwh7 Q/MTXPgOVxZmsKlks2yS5H0OyNCOYngeg+iIbTYmLVEPXKXTZbyj+R35792aYiZB QEQyzV5WaNxt7KavmqOF6FxfYpJTrwXm2phRECg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=subject:to:cc:references:from:message-id :date:mime-version:in-reply-to:content-type :content-transfer-encoding:sender:list-id; s=arctest; t= 1516887929; bh=N5IomhxYmKbZMxIxBhwFelsXIE7IofG2rGyQfJjEM/g=; b=x FOx7/ybOTgfJ7rH1nLmtimL7uh/y0EVIZM5UE2QaIXbDuP2WdLlO6436nXKfiOyd UMpBKGOXgTHCNJlQLf1kfpx0vJwDlSZEwxIuGG1s8khtMV7e38d/SwoKS5iVjKIl lZ6eqMZJNOwf3Usik15tvemM6kJ5AN2C89b7d0th2xG8mTPmbjmKJX8xqclaXCB6 vtz7xUHgLNUnUprBqZ/msm0dpTitU/iEJOSvh7GbgG1MrZV8LpkItcQl3sMz+wQZ lnyxlt15cdYYxCX0KX1tJR7g0VZnYxWyqVJrtJDUoQlMYp5vFCgjcoQyVkYnmhwm BSIAymZuO6c7UJpfQxKTg== ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=suse.cz; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-google-dkim=pass (2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=R4qflxvP; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=suse.cz header.result=pass header_is_org_domain=yes Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=suse.cz; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-google-dkim=pass (2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=R4qflxvP; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=suse.cz header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751120AbeAYNp0 (ORCPT ); Thu, 25 Jan 2018 08:45:26 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:45699 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751011AbeAYNpY (ORCPT ); Thu, 25 Jan 2018 08:45:24 -0500 X-Google-Smtp-Source: AH8x227ClyLHtnhtuqQg3mRw2apLnBub+aYjsh7Ds9W+Fhgvl2WYXnWQwYXjF14W31YoVtEFTmTRJw== Subject: Re: [PATCH 4.14 17/89] futex: Prevent overflow by strengthen input validation To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Li Jinyue , Thomas Gleixner , peterz@infradead.org, dvhart@infradead.org References: <20180122083954.683903493@linuxfoundation.org> <20180122083956.427607580@linuxfoundation.org> From: Jiri Slaby Message-ID: <20567b49-e0a3-e9e0-d520-74bbfc20d414@suse.cz> Date: Thu, 25 Jan 2018 14:45:21 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 In-Reply-To: <20180122083956.427607580@linuxfoundation.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: On 01/22/2018, 09:44 AM, Greg Kroah-Hartman wrote: > 4.14-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 > @@ -1878,6 +1878,9 @@ static int futex_requeue(u32 __user *uad > struct futex_q *this, *next; > DEFINE_WAKE_Q(wake_q); > > + if (nr_wake < 0 || nr_requeue < 0) > + return -EINVAL; This breaks strace's test suite on 4.14.15 (and is present in upstream obviously too): futex(0x7ff568b44ffc, 0x3, 0xfacefeed, 0xbadda7a0ca7b100d, 0x7ff568b44ffc, 0x9caffee1) = -1: Invalid argument strace uses weird values in the testkit to pass down to futex as can be seen. I think like in: commit e78c38f6bdd900b2ad9ac9df8eff58b745dc5b3c Author: Jiri Slaby Date: Mon Oct 23 13:41:51 2017 +0200 futex: futex_wake_op, do not fail on invalid op something similar should be done here too. Maybe: if (nr_wake < 0) nr_wake = 0; if (nr_requeue < 0) nr_requeue = 0; ? Maybe also with some pr_info_ratelimited like in the above commit? thanks, -- js suse labs