From patchwork Mon Mar 19 16:01:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132086 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp47697ljb; Mon, 19 Mar 2018 14:02:03 -0700 (PDT) X-Google-Smtp-Source: AG47ELuMRsy9ylmJGMmQvclwuH8oYJtABC/mwHSvo0+/R3P7iVSwP7xC7wzSzbzPqgbxMhJwapbw X-Received: by 10.99.100.132 with SMTP id y126mr9971685pgb.77.1521493323455; Mon, 19 Mar 2018 14:02:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521493323; cv=none; d=google.com; s=arc-20160816; b=PqOMziWi7BUSEqnq4eYis78fjFJx1vrCCsxsm9fiNujGMckEEaTfAj/RiKWQzDvYwR Agi7hb3UkbMo20JJCwvU5ol1tbJNl1zXFyAeuZwemBfOHoaQgWD/AhcB501dsnSJ3/+2 d3zdKXgNp0DhUy4VD6ESle3jtn/Zf+0KngtjK1SEuQEKs7cJG4/yMZEOHWHym+rS7W2E bdrtd+uDFP7CvlCrSkuZ5VrDKlakXPIWNh6R2WvECK+mNJwiJq/aqCQncAHhgtxjrp4j 7lkJa94wG6Utg7T4bEAvmt8FhPV/TqTmvRtS0+1i6AR+OjwFBcDtcyTN6UGP3asxUou+ Vypw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=rHnZAEVtdZQBn7HzfyIq/Ca/MVj58pSJnqLuAt5TcEQ=; b=jLwvbeaDeZUsvSTJfYjGShniqmS56S1vYsl40cbB3gfMB1pEKl5sQOi4Yvq9VsPbg5 Ib5BALA25oOMJdOPdTLC5ClrPbXFF6ZW7hkdxnXcBhAORPUavKJ2HJbE8GsfNuHEgZOT aFyPZ6wFkK5SPUNo01bmHwisBEv5wCNNHXn6bA5glr3uc5tH5JIRFuKrLaH9xZoYj6QY BKgKx3CzpjPbwDBgRu+6l9CdSCeOic4r2xGSu1FSp4AfgDMvYKgcH9L2MmvqPZ4x1PD5 Y5Ib4nfKapZHac4GSF9xgJoYLvJC/CUMuWtlPvIDAVjjrEvZKyEHQkkXOABPULdLU8h+ kcqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=pA9sDOB5; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 184si84493pgi.76.2018.03.19.14.02.03; Mon, 19 Mar 2018 14:02:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=pA9sDOB5; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S969306AbeCSVB7 (ORCPT + 10 others); Mon, 19 Mar 2018 17:01:59 -0400 Received: from mail-dm3nam03on0119.outbound.protection.outlook.com ([104.47.41.119]:22560 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965164AbeCSQCu (ORCPT ); Mon, 19 Mar 2018 12:02:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=rHnZAEVtdZQBn7HzfyIq/Ca/MVj58pSJnqLuAt5TcEQ=; b=pA9sDOB5pr7OYp9Gmdeghdq0LxUlB9zyDguegaVrCU9pfHJa77O325JbVhGO3Y2vMTrtqLJsru1JQTHQj4gkdvvhR6agOze/aD6h/X3CDJfbzJ5R6Jrm7+oX+yZlxxUnHfUps5jvo2QxTL5y2hHY5UO1NV3XFm70pv09Gdzguyw= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1062.namprd21.prod.outlook.com (52.132.128.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.0; Mon, 19 Mar 2018 16:02:40 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62%5]) with mapi id 15.20.0631.004; Mon, 19 Mar 2018 16:02:40 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Will Deacon , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 160/281] arm64: futex: Fix undefined behaviour with FUTEX_OP_OPARG_SHIFT usage Thread-Topic: [PATCH AUTOSEL for 4.9 160/281] arm64: futex: Fix undefined behaviour with FUTEX_OP_OPARG_SHIFT usage Thread-Index: AQHTv5t7r8edfUCVik+G5LJ0u1syXA== Date: Mon, 19 Mar 2018 16:01:02 +0000 Message-ID: <20180319155742.13731-160-alexander.levin@microsoft.com> References: <20180319155742.13731-1-alexander.levin@microsoft.com> In-Reply-To: <20180319155742.13731-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1062; 7:ZHaiXJ2F4Z737cCsF1+TEVR9jIdgasj9xphv9nr07qL3wCnmobQprOJgVPyPPChCDQ5M38zwa/HKfrzW4xQZpfWaA0sN+v9+bLGEwM8C3D1DCVuDQxK5fITryKKHM/nev8sVoP639ldNWn0B+z0WQP7Pf07/zszlXhHoTqP+ZYQd7od6xzd1zebu5PT6uFRkt93Mxk3g7PksndpLUaQ65pxQORYNsK4u3mGlmuFmhZvLbsXExK6CXwle9ulmQzOE; 20:wLxr9ZpXpkEyniSgc/Af3LrB/79SQJ6BAoWVbNfRJcRkZL5qqyVdIsQLzxvV76t4vmbZNaGdCl7N2elwv8bpf5twsishki+pKsL+UL63ZaGwGzambXlcKBvwnAL9poRTS32mh5BEsvh+Hfu5ApkR3ITeOLy3y5MvB7JJKDev6R0= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 249f1319-49ec-4a9b-2f6a-08d58db2d797 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1062; x-ms-traffictypediagnostic: DM5PR2101MB1062: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(180628864354917)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501300)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB1062; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1062; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(346002)(366004)(396003)(39380400002)(199004)(189003)(106356001)(10290500003)(478600001)(110136005)(22452003)(3280700002)(6666003)(54906003)(2906002)(2900100001)(2950100002)(186003)(10090500001)(97736004)(26005)(5660300001)(72206003)(66066001)(53936002)(107886003)(102836004)(59450400001)(6512007)(6506007)(316002)(7736002)(305945005)(1076002)(6436002)(36756003)(3846002)(6116002)(6486002)(105586002)(8936002)(86612001)(68736007)(3660700001)(86362001)(81166006)(81156014)(8676002)(25786009)(2501003)(4326008)(76176011)(5250100002)(14454004)(99286004)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1062; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 3Sk7tox1EkOe9o5AATjAn/57psXG+bWo59JJzkSzafWYgpisnMvTtBTtdf//zI5qJuUuazZYmOmGTc0FmeFdbnBXLzTxHSSiFpGE13OqM5UDpoPlV0GMOhkWpoNF7jYnqn3MGBmfx7q6+pZUQPkJSaOKZ8CnWUJYOYqPBdLvf2FAn1/jg3IHg70zVv4bQJ3wpMof+KbxDqn4KmukPfuLcsacL8pWcl3UiNHWUkxkK8s3tYro+8XFNVozYnOTGn7ApIn/I+M8Y6HylT9zRiun2Ul76nVFTevSojZ8tHG22HpV3gRqE1gF0iAqy8Z+K433wlHyOdbkaIIpeD1JXQ4Kuw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 249f1319-49ec-4a9b-2f6a-08d58db2d797 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:01:02.9808 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1062 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will Deacon [ Upstream commit 5f16a046f8e144c294ef98cd29d9458b5f8273e5 ] FUTEX_OP_OPARG_SHIFT instructs the futex code to treat the 12-bit oparg field as a shift value, potentially leading to a left shift value that is negative or with an absolute value that is significantly larger then the size of the type. UBSAN chokes with: -- 2.14.1 ================================================================================ UBSAN: Undefined behaviour in ./arch/arm64/include/asm/futex.h:60:13 shift exponent -1 is negative CPU: 1 PID: 1449 Comm: syz-executor0 Not tainted 4.11.0-rc4-00005-g977eb52-dirty #11 Hardware name: linux,dummy-virt (DT) Call trace: [] dump_backtrace+0x0/0x538 arch/arm64/kernel/traps.c:73 [] show_stack+0x20/0x30 arch/arm64/kernel/traps.c:228 [] __dump_stack lib/dump_stack.c:16 [inline] [] dump_stack+0x120/0x188 lib/dump_stack.c:52 [] ubsan_epilogue+0x18/0x98 lib/ubsan.c:164 [] __ubsan_handle_shift_out_of_bounds+0x250/0x294 lib/ubsan.c:421 [] futex_atomic_op_inuser arch/arm64/include/asm/futex.h:60 [inline] [] futex_wake_op kernel/futex.c:1489 [inline] [] do_futex+0x137c/0x1740 kernel/futex.c:3231 [] SYSC_futex kernel/futex.c:3281 [inline] [] SyS_futex+0x114/0x268 kernel/futex.c:3249 [] el0_svc_naked+0x24/0x28 ================================================================================ syz-executor1 uses obsolete (PF_INET,SOCK_PACKET) sock: process `syz-executor0' is using obsolete setsockopt SO_BSDCOMPAT This patch attempts to fix some of this by: * Making encoded_op an unsigned type, so we can shift it left even if the top bit is set. * Casting to signed prior to shifting right when extracting oparg and cmparg * Consider only the bottom 5 bits of oparg when using it as a left-shift value. Whilst I think this catches all of the issues, I'd much prefer to remove this stuff, as I think it's unused and the bugs are copy-pasted between a bunch of architectures. Reviewed-by: Robin Murphy Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/include/asm/futex.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/futex.h b/arch/arm64/include/asm/futex.h index f2585cdd32c2..20dcb196b240 100644 --- a/arch/arm64/include/asm/futex.h +++ b/arch/arm64/include/asm/futex.h @@ -51,16 +51,16 @@ : "memory") static inline int -futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) +futex_atomic_op_inuser(unsigned int encoded_op, u32 __user *uaddr) { int op = (encoded_op >> 28) & 7; int cmp = (encoded_op >> 24) & 15; - int oparg = (encoded_op << 8) >> 20; - int cmparg = (encoded_op << 20) >> 20; + int oparg = (int)(encoded_op << 8) >> 20; + int cmparg = (int)(encoded_op << 20) >> 20; int oldval = 0, ret, tmp; if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) - oparg = 1 << oparg; + oparg = 1U << (oparg & 0x1f); if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) return -EFAULT;