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; From patchwork Mon Mar 19 16:01:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132085 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp47505ljb; Mon, 19 Mar 2018 14:01:55 -0700 (PDT) X-Google-Smtp-Source: AG47ELtQCzC+JqRIzBFjppUEsFta5rNfe6z4lyN5mPPAPrrUjy2PwweUmD+sOVfkbbKUUvgWdOjR X-Received: by 10.98.75.129 with SMTP id d1mr11428593pfj.19.1521493315302; Mon, 19 Mar 2018 14:01:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521493315; cv=none; d=google.com; s=arc-20160816; b=Maih6c7/b6a4hJjwt5dSK3FJeX9olH3bAVADuD9USpWE4p4mofuKhv1u0DheshITA/ RPp1xyQsx5kVMRkgNBN4/E28vlcNOveRjUExXcRm17yoPF09JZ+grbxrpor6QbLrd1lr 26tEISBZeTehFKNW2GYmzD49Ink6HDQuGgSi3unvgPlJfuBHpB/lL2vuFiQf9DuaZ7cs /4Kg5Gq6RjO42agCeH2lbCG0YdmwfNRLTbGya8xxqBqzsOTIRprALoSdIa8RLS1EAJz6 px201qDrKT9EmgdQO1qL8wiZcGAq5zO4kwZLTKeE3X5FdHp6fZFFNxPraYrs5Q0CDzGC ASGw== 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=MA6SHdSVA6u8PdYHlRkj9p6VREYNGq9a2gjZQVpbpO8=; b=GnlyjQNrQ+PR/mB6s4pePJXwz2XHOc/K0YPa/AlW4sJHy10jRE9zwWOGmHq2Q0OUNc JjRFXBbdX6pP22M4NWEOsV1pwBeUVSi+mlCLIeegItZNu283tOYEKdgBkFcpBW3G33Dl ljGWzGbQGl3OeXVXr3FfayNjMpQHw6IrvthVV7mUOwM107jNXNmuq+CxoNyANljBR9lH ZfxIY1hOjOZkUQT3Syr6qvFzf2cfrgok0y87Cl17N5H87qzNvGxaut8aPZTB/QR6MZ7M DJKsOO1xUPnUfAPvliqZ+pswiHFCscboTempdeHDcKg/ELy2L46CLfNhwTopHKquiDTC yZGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=k45w7hh1; 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 t80si62253pgb.686.2018.03.19.14.01.54; Mon, 19 Mar 2018 14:01:55 -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=k45w7hh1; 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 S968694AbeCSVBw (ORCPT + 10 others); Mon, 19 Mar 2018 17:01:52 -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 S965481AbeCSQCw (ORCPT ); Mon, 19 Mar 2018 12:02:52 -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=MA6SHdSVA6u8PdYHlRkj9p6VREYNGq9a2gjZQVpbpO8=; b=k45w7hh1/8Nr5g603QWSOtSXshUYyuzGkoLeJ+elbTMYJA2UbW6B3fjt7hoHfcFODZe2Ji/198TCAY0ADwitoGdCmTlUi1yj/Hptkc0hDouX5NhRpL4ZpwVVwWW4dEYfI8VkQ/d2OQrF9GjZmoQBT8neNFdHq+Q+Mnvv0bKIoQ0= 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:41 +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:41 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Arnd Bergmann , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 161/281] net/mlx5: avoid build warning for uniprocessor Thread-Topic: [PATCH AUTOSEL for 4.9 161/281] net/mlx5: avoid build warning for uniprocessor Thread-Index: AQHTv5t7eq+0oF4EH0OO5LTRUM3aBA== Date: Mon, 19 Mar 2018 16:01:03 +0000 Message-ID: <20180319155742.13731-161-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:5WWcdzlXISogB7k23VbofCJT3+aIfE6jgDcDVwUJhsH6WYqggGjhLv3hGG7bk6w/MlicLB6n3QTqn6E9E+AIwjVCcubj8eZWC3CLLUukQIzSUyAzjVnDEtLgr4Fp5f+IA9eU1leJ56wgGrXFoCp8HZuN/SUMkXdgg1qOJgoM9pd76oIVMJCvCePRhkW35YNzp8xWlzgVngFZjjlHgIBlxGEcOCWBa4VBweIEukyq4VLH8yjSdOXD3H0kJC765NKx; 20:rus+wv3GX0IJP86dPjOVKlk81nNxR6n/FnkkFgCy4YnplaH79fzf1eaJ5re2XAHP862a99EtxXlhylIZrIPHE25uvoUG+6rMiqYdvR3ccDFEaCefKxz7vyCQNVdfnK8XE95NOy15KtiaUwLFRXCtXO5+Q0iyDOS0dv7DGyYW8h0= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 21760392-4fe3-4fdb-8f61-08d58db2d850 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)(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)(575784001)(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: Vb+YVa9uOBV2BnIQ4tayiqoYOM8iPweM920wagfK5wuEV19wF4UTb3HLdNrHaUC7cwsqqqg7FYXV7Sb1YzT00KbJw0W1PpgjPAZAA4SCaUKC6tZCnBmd81+PvWoDPXWYxPxQrN1j9SJkkK4m3drLXm5vjLsjJsZDZI5cBC1WhVo2dmNN6P+/kAHY/vtYjOfnpGfDydBjZpoKvXotUuwigjBtBWP7+afahV0rFlrVVb9mJ63hdrF6eyjo4SaRS49IvuBhjS64Iy9vJi3e/1ndERSYQDR+PcZPNNYMohFUO4aaEdPLBJIF3uXAFjjLsHiIZEEcIpz2souF31HBIbdivg== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21760392-4fe3-4fdb-8f61-08d58db2d850 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:01:03.9936 (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: Arnd Bergmann [ Upstream commit f0d7ae95fff4ab444b8433f07afc4b077ef1a285 ] Building the driver with CONFIG_SMP disabled results in a harmless warning: ethernet/mellanox/mlx5/core/main.c: In function 'mlx5_irq_set_affinity_hint': ethernet/mellanox/mlx5/core/main.c:615:6: error: unused variable 'irq' [-Werror=unused-variable] It's better to express the conditional compilation using IS_ENABLED() here, as that lets the compiler see what the intented use for the variable is, and that it can be silently discarded. Fixes: b665d98edc9a ("net/mlx5: Tolerate irq_set_affinity_hint() failures") Signed-off-by: Arnd Bergmann Acked-by: Saeed Mahameed Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.14.1 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 935e62635f12..3c183b8c083a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -557,10 +557,9 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i) cpumask_set_cpu(cpumask_local_spread(i, priv->numa_node), priv->irq_info[i].mask); -#ifdef CONFIG_SMP - if (irq_set_affinity_hint(irq, priv->irq_info[i].mask)) + if (IS_ENABLED(CONFIG_SMP) && + irq_set_affinity_hint(irq, priv->irq_info[i].mask)) mlx5_core_warn(mdev, "irq_set_affinity_hint failed, irq 0x%.4x", irq); -#endif return 0; } From patchwork Mon Mar 19 16:01:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132069 Delivered-To: patch@linaro.org Received: by 10.80.152.129 with SMTP id j1csp3115820edb; Mon, 19 Mar 2018 11:08:26 -0700 (PDT) X-Google-Smtp-Source: AG47ELttxywPBA9cmXRqpyNfvlguoF1NBrWD/vpsvnWQ06zXk8Vhela+hA8tp7oiTOj3LrQWNEHX X-Received: by 10.98.198.146 with SMTP id x18mr11004716pfk.22.1521482906270; Mon, 19 Mar 2018 11:08:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521482906; cv=none; d=google.com; s=arc-20160816; b=sInY8TOMDo0lQZcu2lv8RyCDTEmYurSF1/UyPFsM270d2t7sZqV+2wTJPooLvQ1CRU vGmk6e8DnPdG1RAfqy5RXLN4Y3oMPc7jDwiktFyztbuZdGm80DgEJ0C1s0mNgJgKqeTd b8V6WTagNqIY7LCzl4CNLIJkeXjUH2k/6ZS50sMBBrA58tltAz8Gyxyb6F8yygsNFj4n FBacishi8vyTJIIVK1bVdKsM16A99aXXssfLiRtHkottJGKheWWjCZ20CGcIZ93gLPYp +LBUyeH2xFA5IucA5yCR5i9n5eoyCGmb8i9JVsSPjV6PkLbJko3M/GMQfT2tMYW4QjE6 a1Vw== 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=70xCEdlHWi8aTrpwhcaYzB1G1UYbBkSOsS+2eFP14PM=; b=lxm+jPjLjFaoTF03imaVfcI3oGdzE2Nszg26BtYtWjC87hrhSKf14mKReLKI9RVR4d i7CNGrkxKpqqQTUI3N0dCGmOp82y+3NDlL+onm5FBcrUsRsmzgqlbKfmpCGiLTEwKjWH 4oawVidhlR9l/UUE/8OpjauTnFfArLm6NUhp1Ms/sb4x75I6zk84H7hsqqGL+hCxAjN4 ww1uI+qj7NUnmlIOHHfP9sIFQCXa78+kEANqYj6nuQxyy5o3TGzN0bDQWxyosMMKoEhm 3DUn9CPlixrIPnIAxhI4SdibOMGjgggm9alZ5Xl/QdKYwI6axwv1LmKVJI5TJhfYRPGe W/VA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=QcEdX7Li; 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 e28si301810pgn.621.2018.03.19.11.08.26; Mon, 19 Mar 2018 11:08:26 -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=QcEdX7Li; 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 S965588AbeCSSIY (ORCPT + 10 others); Mon, 19 Mar 2018 14:08:24 -0400 Received: from mail-cys01nam02on0139.outbound.protection.outlook.com ([104.47.37.139]:43744 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965554AbeCSQDO (ORCPT ); Mon, 19 Mar 2018 12:03:14 -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=70xCEdlHWi8aTrpwhcaYzB1G1UYbBkSOsS+2eFP14PM=; b=QcEdX7Li4S0l/Jn+VWZdHW/6aFy0vi76KIOql21o8hZJIa/+zR1cEpYAjbrTnSyiRjy0q+fOwt3GbX7PaMO6o5ef6uhumdIjw4RDDak/N1JxzuH1pVIkBBkPqDGLjnLP4Yc/r8H3Qp4rLxrakOJhdxEg9o8ILEFSEFSPO2ZNe9k= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0725.namprd21.prod.outlook.com (10.167.107.167) 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:03:07 +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:03:07 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Maxime Ripard , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 173/281] dt-bindings: display: sun4i: Add allwinner,tcon-channel property Thread-Topic: [PATCH AUTOSEL for 4.9 173/281] dt-bindings: display: sun4i: Add allwinner,tcon-channel property Thread-Index: AQHTv5uEyhRuuojrb0qhu15AHcMSUQ== Date: Mon, 19 Mar 2018 16:01:18 +0000 Message-ID: <20180319155742.13731-173-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; DM5PR2101MB0725; 7:tLTXo4x7zXxPzplYz9Y4r0GKYDvnhDp8mdlr2Mc8LsUlp5G6Q882/QXFJRgUNjMdDUr37sUkQ9pgEOvrAeuEBNA4HgauOgL/yilTaivvb3LZdj9v+SNpW2Ahtt8jL/ymnVgovjUpuLFYu2l9eP7Kua0DZ5XzSgCGqYuGEZMZsGFABXsNlSvm8kNKDWKOBwfup93asoMYlxkCPC1Z0igqkfcG7yoK2TH1YrzZAU5W+RgMtREjZoUmpCFT025ntiAZ; 20:Is8sEkTnSMu6P4YSO7U2xfHQA/VlAfG3+KjwVf38UEKpqtYN1KH2Riqz0LNtzUo0ba+uCZrJAjkZYQW/rn4dcmNjwqvRjd9HeHVKbl5Opo1m24voH6LkCFbP0tK3/ONXjVX7aBRIu/VEuoMUG7DzP0HvkG2UrQfy7YFcXzj8mDg= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 919a95d2-4b9d-4f22-3b4f-08d58db2e7dd x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0725; x-ms-traffictypediagnostic: DM5PR2101MB0725: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(58145275503218); 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:DM5PR2101MB0725; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0725; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(39860400002)(376002)(346002)(366004)(39380400002)(199004)(189003)(2900100001)(4326008)(54906003)(10090500001)(81166006)(316002)(2906002)(14454004)(110136005)(107886003)(6506007)(186003)(81156014)(22452003)(68736007)(53936002)(3660700001)(478600001)(5250100002)(2501003)(99286004)(36756003)(105586002)(6116002)(3846002)(5660300001)(72206003)(1076002)(2950100002)(6666003)(305945005)(6436002)(86612001)(66066001)(10290500003)(76176011)(97736004)(8676002)(7736002)(8936002)(6512007)(102836004)(106356001)(3280700002)(6486002)(86362001)(25786009)(26005)(22906009)(142933001)(32563001)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0725; 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: DEdLATIpTDJDJnj75qDArJEfeivu03hghvrZ1BGzg+xHTHxrZCKvS96wlRokxN60CY94XBxRvAJsPIWoPSxUppV3xGe9I3S3JiIUXPJG/5Uf5jUt3oEhP+KBk8N15OypB36YWPVdyO3FfRCVWarGjheUfLHDVEfjprAq80MOXvtpBeYzN1yc+BoPaN0NYX1rzazEakw/zI3C+Y82OTidWGAkhdjrmgHhCcXKZRMLVJor1SrouF+hF2YLVqKmDPhhAupuKUnVdrONqQBt0raeXjJaIBJvhBH9zk4/vdxj3FjIWOkByu75PAeFRnIs3cP1n/AGN/Y0NcgABniSSvKC4w== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 919a95d2-4b9d-4f22-3b4f-08d58db2e7dd X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:01:18.1577 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0725 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Maxime Ripard [ Upstream commit 22662f12768f971809b478386d9cc4947d00497a ] The Allwinner Timings Controller has two, mutually exclusive, channels. When the binding has been introduced, it was assumed that there would be only a single user per channel in the system. While this is likely for the channel 0 which only connects to LCD displays, it turns out that the channel 1 can be connected to multiple controllers in the SoC (HDMI and TV encoders for example). And while the simultaneous use of HDMI and TV outputs cannot be achieved, switching from one to the other at runtime definitely sounds plausible. Add an extra property, allwinner,tcon-channel, to specify for a given endpoint which TCON channel it is connected to, while falling back to the previous mechanism if that property is missing. Acked-by: Chen-Yu Tsai Acked-by: Rob Herring Signed-off-by: Maxime Ripard Signed-off-by: Sasha Levin --- Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.14.1 diff --git a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt index 4f7ae7555758..bda9d6fab6b4 100644 --- a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt +++ b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt @@ -47,10 +47,13 @@ Required properties: Documentation/devicetree/bindings/media/video-interfaces.txt. The first port should be the input endpoint, the second one the output - The output should have two endpoints. The first is the block - connected to the TCON channel 0 (usually a panel or a bridge), the - second the block connected to the TCON channel 1 (usually the TV - encoder) + The output may have multiple endpoints. The TCON has two channels, + usually with the first channel being used for the panels interfaces + (RGB, LVDS, etc.), and the second being used for the outputs that + require another controller (TV Encoder, HDMI, etc.). The endpoints + will take an extra property, allwinner,tcon-channel, to specify the + channel the endpoint is associated to. If that property is not + present, the endpoint number will be used as the channel number. On SoCs other than the A33, there is one more clock required: - 'tcon-ch1': The clock driving the TCON channel 1 From patchwork Mon Mar 19 16:02:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132065 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp3003363ljb; Mon, 19 Mar 2018 10:47:55 -0700 (PDT) X-Google-Smtp-Source: AG47ELuQYDad1874Me7P+oVh16IWsJ5XLnehPtQBH8g+lWrNy//0oDVqEOEijpO9+vHZqf3gRfHl X-Received: by 10.98.30.66 with SMTP id e63mr10929563pfe.67.1521481675273; Mon, 19 Mar 2018 10:47:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521481675; cv=none; d=google.com; s=arc-20160816; b=VNUWsWPvBxMeSQLnroRoxT/W7g2De92pDdZmVWXYDae5QFImnu+Ph2eb2HBVwwZRBN 3JzrPy72n4u0A/hl+cv8fiw29OMjlHn9Ljmso6A7Q46F3TDlihOLtT+g4ETPpkH4hr/Y f0gL2XsPdj0CYX5z2pEJC4Dlq1eHl8TGy5WRuqLGSrhbeC3aMGbpi2gE1UIZkYlwBgA4 9XOA4iI36DbrlaEFVLVaR0x4AZhjKoyuF+SCkSC4FbNBIIrT6cJ+sYBsZpPQpbqu8L53 N1ZwzEHCbVAJ+uwPNBEZLatM5PRtYB+fZjneuO15tYGTPVhkP3APSYHJIlrruJsu2d7d EwuA== 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=Z+2GT6WaB9Yj4POnOfARkKGX00C/MqydS7IRW2QPR7w=; b=S31yWQ0+y/wtL9xE9AADrIN0LYbQsU18xLAaGg3MNAQLD3YvVw3tzxmQ/+gT/jFECp H4n0rWwBfUADSEzbwuVMEWQXYPV/J2i7WWMnQc2Ust+JPj3SfSrI2B2FHD0XBcktKTkc Jqkv/FsscqG4N/xe50Vw1c+x7dh8WuYQ4A2fUatno65FjvHc8bHyMFKiQBp+DxvfJEVt brWq2Aa786jAcaiI2Rrm5prIXttU/EhL9PRO1VMVaKLpsqBnoW3+AOPhaEzCE4U5JCNH MS4gPTllof3zus34P5JlvwnqUNYc/4QN0LyG2q070Dn4VWkfngNP+Yj6O8GN59UUxzjO nhjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=ls2ld01Y; 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 u12-v6si352776plm.481.2018.03.19.10.47.55; Mon, 19 Mar 2018 10:47:55 -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=ls2ld01Y; 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 S965817AbeCSRrx (ORCPT + 10 others); Mon, 19 Mar 2018 13:47:53 -0400 Received: from mail-co1nam03on0101.outbound.protection.outlook.com ([104.47.40.101]:45241 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965768AbeCSQFK (ORCPT ); Mon, 19 Mar 2018 12:05:10 -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=Z+2GT6WaB9Yj4POnOfARkKGX00C/MqydS7IRW2QPR7w=; b=ls2ld01YGWMXJjGDqJCapCEc7RFzZrMvSl/dwEd8iaEr4tYl3W9KGrlABeWBu6RkPmCzZME7yVcZmqg7NUBffoXLbxGThGJctnCwkTHJuNl8svTUVIH+HDgru5B5m1mxf/g1kKyTzdWI+wE3Z5TJRE+uJxHn6ctiRUuPXv6s1D4= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0885.namprd21.prod.outlook.com (52.132.132.154) 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:04:55 +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:04:55 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Tero Kristo , Herbert Xu , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 239/281] crypto: omap-sham - buffer handling fixes for hashing later Thread-Topic: [PATCH AUTOSEL for 4.9 239/281] crypto: omap-sham - buffer handling fixes for hashing later Thread-Index: AQHTv5uz5Gz/MZzJkUqCXrLsexWXDQ== Date: Mon, 19 Mar 2018 16:02:37 +0000 Message-ID: <20180319155742.13731-239-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; DM5PR2101MB0885; 7:x3mj9eLmWHygruWQycxQIU13FDgI3bNjrAARePaPCt1om2NbJivngs299DwEw1WrTLVDoZm5bA3Tw1jEUv8TvMl1NXwjGrKMQvtmuEGhYi2BtDtLlhLdAOfUblm/i20y/87EWCevwYs/393RNDfIxIimQHI303M0yj5MYFgCtbw9HD+CVeB89MhLpNGpiMXAo4dEpFtFrIXnqru1K/gQuRpxAbkucvMclJz1EfCQeJJLaYczY8TFI7dD541vOdQV; 20:n+3mzT1PkUva8HClG5U5bVq7WtXaR2f9uI8JWaMFGwwPgW9LAZ5HMZgSUFjVdcwsexKnTZwz9Bjv/eQLfKeMK3cQQwtU5thbBZ5Wlbt8etLe5oFZ0hIbv6AoC+IZU9rUxwasfEuw7pNOhma998K1/Ps86CUmMvpgZ9n1axcwlnQ= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 82bfe8c5-b08f-4f5a-c5d8-08d58db32843 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0885; x-ms-traffictypediagnostic: DM5PR2101MB0885: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(31051911155226)(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:DM5PR2101MB0885; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0885; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(346002)(376002)(39380400002)(39860400002)(396003)(199004)(189003)(6666003)(8936002)(99286004)(3846002)(107886003)(2900100001)(68736007)(14454004)(6512007)(72206003)(81156014)(81166006)(105586002)(4326008)(25786009)(1076002)(22452003)(575784001)(86362001)(110136005)(10090500001)(54906003)(53936002)(316002)(66066001)(6486002)(106356001)(6116002)(6436002)(2950100002)(3660700001)(8676002)(36756003)(97736004)(102836004)(2906002)(305945005)(5250100002)(478600001)(6506007)(59450400001)(7736002)(3280700002)(5660300001)(26005)(86612001)(10290500003)(76176011)(2501003)(186003)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0885; 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: SQdXqmPKFmqLsBfv74nQSXn5UdQgudcey8PbfmzkNVaJ9EKXE1w6aScxBlQrCVk4KUtk9J0qg6Dz2NExHo9Ek6X3PzKttpvcNwF2g7CzlzKY58exu5mXecS5ysVLQpnFkDtdbr6MAhQMLAnMs4e3Yr3f02ypkcv3IgpfQdCCPOexd3HdhIwd0jbaPJq0+p5tN8VoDC1rrDEuBPXaaM5E+9Rh7FWNgx7hvGyF8tFwK9ZbtbwLVl7mbX5c1XvCAR3TazUwfqeV/l8EHZQBF4Hv2WmwWBPTwl07jyrsrHpsd5vriC0iriYfAv+7BdnRNTUjadMPFStRsUzlo16NAzxLjA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82bfe8c5-b08f-4f5a-c5d8-08d58db32843 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:02:37.2515 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0885 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tero Kristo [ Upstream commit 5d78d57ede8f9e7f656c610ed25be7be337e0529 ] Currently, the hash later code only handles the cases when we have either new data coming in with the request or old data in the buffer, but not the combination when we have both. Fix this by changing the ordering of the code a bit and handling both cases properly simultaneously if needed. Also, fix an issue with omap_sham_update that surfaces with this fix, so that the code checks the bufcnt instead of total data amount against buffer length to avoid any buffer overflows. Signed-off-by: Tero Kristo Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/omap-sham.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) -- 2.14.1 diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index d0b16e5e4ee5..c65b49baf0c7 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c @@ -873,14 +873,21 @@ static int omap_sham_prepare_request(struct ahash_request *req, bool update) } if (hash_later) { - if (req->nbytes) { - scatterwalk_map_and_copy(rctx->buffer, req->src, - req->nbytes - hash_later, - hash_later, 0); - } else { + int offset = 0; + + if (hash_later > req->nbytes) { memcpy(rctx->buffer, rctx->buffer + xmit_len, - hash_later); + hash_later - req->nbytes); + offset = hash_later - req->nbytes; } + + if (req->nbytes) { + scatterwalk_map_and_copy(rctx->buffer + offset, + req->src, + offset + req->nbytes - + hash_later, hash_later, 0); + } + rctx->bufcnt = hash_later; } else { rctx->bufcnt = 0; @@ -1189,11 +1196,10 @@ static int omap_sham_update(struct ahash_request *req) if (!req->nbytes) return 0; - if (ctx->total + req->nbytes < ctx->buflen) { + if (ctx->bufcnt + req->nbytes <= ctx->buflen) { scatterwalk_map_and_copy(ctx->buffer + ctx->bufcnt, req->src, 0, req->nbytes, 0); ctx->bufcnt += req->nbytes; - ctx->total += req->nbytes; return 0; } From patchwork Mon Mar 19 16:02:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132047 Delivered-To: patch@linaro.org Received: by 10.80.152.129 with SMTP id j1csp2985491edb; Mon, 19 Mar 2018 09:05:22 -0700 (PDT) X-Google-Smtp-Source: AG47ELuaCQSYT7PJWFv8L9d3q3GFSaErUOlwLIdmQsSMCpfQRlcTp0j4uslmlrl/vohzydasWfuR X-Received: by 2002:a17:902:209:: with SMTP id 9-v6mr12796034plc.403.1521475522209; Mon, 19 Mar 2018 09:05:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521475522; cv=none; d=google.com; s=arc-20160816; b=0jpgtgRomIx/sbx50sNKzVSslkOkhZNB77keLbCBrAEFpFBr6RoVeR4cj9yaxV9PwS b0QN4+uDn0XX24knJ8aUuAsjpIAltnFvxoRzBQDc5yMMf6JApvXR2st5mOHZ8JO2bdr/ 1aak+33zBAR7SgTFPkcCv+lLSo0ZPY4oNtRLGZfg7/e7XpEVHh/BWSh4hX9gUKqP9zv4 6zXdMZIQGrfqrtaP20+vlaaD13xg6qXPtfC06O4xPjFZ61qwUCr0Z5++tnag9EryRZOu 5aYUUXTt5UH1+HTSdVhSkZpQIedqO4/AewPOgLRp9nryNSgnr8KWya0vuaAQFDg0pxWr uFKg== 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=nUA0lifGzUQktYCG+6wH53n43q2Sfi88StTyB1PX0hs=; b=DG7hHvVDe4McoXJ5iJCiyGmOmdbcuSF9SxHnq3iA9IzM1Xpk0ltvDrZbSUriO4eGHh 6sXIm/sq382bkAKqx/zCvFsB8i2LU72mBYQiyPswr4xZbb+4pyPbVoIdKvvymsygkk3Q cCyKG6wqInocgy8n1WgmzMKXPevN1auPcmQ3EneJDu2RHLliuUusKy4wY20BHu2tB7X/ hfa6P32JAQANlJnM8Sfv/3QyzFfpWO1gKCU0RfPj341aBObImrSmIIjaOGCMJB6iDa3n O8+4BAMHQKeCZ5Vs6kwo0FLlEZhh6x2R5eYLFyE6Nsr46ZETH63d+XjZMYdf6lg0buou LOFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=WWAlvu2F; 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 a11si162186pgt.752.2018.03.19.09.05.21; Mon, 19 Mar 2018 09:05:22 -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=WWAlvu2F; 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 S965787AbeCSQFS (ORCPT + 10 others); Mon, 19 Mar 2018 12:05:18 -0400 Received: from mail-co1nam03on0134.outbound.protection.outlook.com ([104.47.40.134]:7948 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965782AbeCSQFN (ORCPT ); Mon, 19 Mar 2018 12:05:13 -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=nUA0lifGzUQktYCG+6wH53n43q2Sfi88StTyB1PX0hs=; b=WWAlvu2FW6H6k0hp4F69XN8P7vvfKfkVyXLG2J2tJlt2dGg0WupUOAR69JVinDGkxJ7FDljCc3XJNx+5wtc7JNsrAKeJ+mR4NN/OhYrwKCEH/C1E5Mvru3cV/0CN40NGEElAgeuTIvN9j/UAbtYwMzDy2QaZAP2DPk0GV+sPUqM= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0885.namprd21.prod.outlook.com (52.132.132.154) 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:04:56 +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:04:56 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Tero Kristo , Herbert Xu , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 240/281] crypto: omap-sham - fix closing of hash with separate finalize call Thread-Topic: [PATCH AUTOSEL for 4.9 240/281] crypto: omap-sham - fix closing of hash with separate finalize call Thread-Index: AQHTv5uzd2Bm/0Bp6UKw6ndd0mAlvQ== Date: Mon, 19 Mar 2018 16:02:38 +0000 Message-ID: <20180319155742.13731-240-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; DM5PR2101MB0885; 7:dhlO8/xIXC8oxlkc6LbCFiDDx1CgywoqAgImJpYp1m2lilRWN5x0PhwTxPj7oAmGBfhJBMzOcTfm87xX7HYr8znjWU7JCfiFO81VP1VhmzYCTDQKH7haGBUfnGL7NDT2So+wo95DmYwYUokN/3PHNaBw7aekAKuxbI36Qmk/cO8zSaKbdGMegynTgOnkrDmUbC+dFf3wfnjEkkamPJBqZI7naDWAN98fPduBR64uPGOx2wiaeTOgxOmZcX8Q16fA; 20:1oArdA190Brs9eftpFnMqJE2H9Og33VPEdixqz1m8U2mt3u4gqYCxNr1fASiwoBn8m/CA3itCHk518tt8IYot1AaqLBgLwpFuk/EPtvrhnhFwgQqnVGfLOCOfjdQzTknL/xks9xQCNR/5rcKGDh6mz08EVBrZDN0QP8Ie1syF9s= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 27d08a85-12aa-42fa-3479-08d58db3288f x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0885; x-ms-traffictypediagnostic: DM5PR2101MB0885: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(31051911155226)(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:DM5PR2101MB0885; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0885; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(346002)(376002)(39380400002)(39860400002)(396003)(199004)(189003)(6666003)(8936002)(99286004)(3846002)(107886003)(2900100001)(68736007)(14454004)(6512007)(72206003)(81156014)(81166006)(105586002)(4326008)(25786009)(1076002)(22452003)(575784001)(86362001)(110136005)(10090500001)(54906003)(53936002)(316002)(66066001)(6486002)(106356001)(6116002)(6436002)(2950100002)(3660700001)(8676002)(36756003)(97736004)(102836004)(2906002)(305945005)(5250100002)(478600001)(6506007)(59450400001)(7736002)(3280700002)(5660300001)(26005)(86612001)(10290500003)(76176011)(2501003)(186003)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0885; 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: xq/BE76fQFWcpY4NqQnPzMo2GyeRnW6W6N0IV4Fq4Fm1RvRmcTUHsliWDEy8Et210s8z3I3wvUv5LlyOsrHUoqJg5ZjwcMa8vPHteHt8wuMHPPaX69oIDNZ/1TlUigRYQzif3UUaBrL5X18Xbz/36UxNENgK0R/UMC5BU2u0cb/LsganoNj1FcIA+ZX7bdK5PDEdTQ5W/B9qJlyxamrnE+q+vXUW3+tAPzsTk9H4rhx5gsumpLGBQT8s0tXp6miKTGWH5FiHCytccnRfRs5R7Vcp69GnEuZ4ymdjQLi5mjYnVMuMtDxfYCaRZ/xPrvfTSzMkZxQ4h14oES9GOg8I0A== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27d08a85-12aa-42fa-3479-08d58db3288f X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:02:38.3713 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0885 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tero Kristo [ Upstream commit 898d86a565925f09de3d0b30cf3b47ec2e409680 ] Currently there is an interesting corner case failure with omap-sham driver, if the finalize call is done separately with no data, but all previous data has already been processed. In this case, it is not possible to close the hash with the hardware without providing any data, so we get incorrect results. Fix this by adjusting the size of data sent to the hardware crypto engine in case the non-final data size falls on the block size boundary, by reducing the amount of data sent by one full block. This makes it sure that we always have some data available for the finalize call and we can close the hash properly. Signed-off-by: Tero Kristo Reported-by: Aparna Balasubramanian Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/omap-sham.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.14.1 diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index c65b49baf0c7..d8305ddf87d0 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c @@ -750,7 +750,10 @@ static int omap_sham_align_sgs(struct scatterlist *sg, if (final) new_len = DIV_ROUND_UP(new_len, bs) * bs; else - new_len = new_len / bs * bs; + new_len = (new_len - 1) / bs * bs; + + if (nbytes != new_len) + list_ok = false; while (nbytes > 0 && sg_tmp) { n++; @@ -846,6 +849,8 @@ static int omap_sham_prepare_request(struct ahash_request *req, bool update) xmit_len = DIV_ROUND_UP(xmit_len, bs) * bs; else xmit_len = xmit_len / bs * bs; + } else if (!final) { + xmit_len -= bs; } hash_later = rctx->total - xmit_len; @@ -1137,7 +1142,7 @@ static int omap_sham_handle_queue(struct omap_sham_dev *dd, ctx = ahash_request_ctx(req); err = omap_sham_prepare_request(req, ctx->op == OP_UPDATE); - if (err) + if (err || !ctx->total) goto err1; dev_dbg(dd->dev, "handling new req, op: %lu, nbytes: %d\n",