From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1254417-1520119902-2-16461613994631807069 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.249, 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='CN', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' 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=1520119901; b=S57bwzMmdkyL1odbNdccDK0SLBWQKWCoERAiKKLcB0mClIb CuHnSJSwcN4F4QUGLmMzZKKUIa+ki154g8B0z8z6eh5YHMN6qalr/VYJ76BYZnHR Q0GRxwN48s2ZnSvy89GkMVhgKYorUuLxaJQ3ROzkx99IbBhL8g+yGDK4PRCl5l0s JZsS1fQ75ZwE8DPuVHbZ8dF+j/ooBajYU2Dzku2l2mTct4wu81LzREF3jmjd3drw Oe/aQJCjAYmMQvPWG2/s7Adlubjy4s5vivN1SoSiNBJKA2ZinVSID1fORvo1eQsK k2JPjpZS6ONZ48/b+diYZVHacZ7JofNdidrPtdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1520119901; bh=KEy8Ls Zc0LfdOfg2mVFc9OdXnFo0N43pB988qPjXfjc=; b=ihyELei4SA9rM+tnZS/0og d+yLdlk8xrWmbvmSXpXkrUTR+vh9jpFDr7Q/HBdy2dwkYtH9zLHtIFK479iQtqeS POdlp/KQj4/Ixlro/DKTIhPtAyoKZkw36pCkTEc2Zok35cNzjrELs6M7oioqN2rV yWfwbBivOPL91WHsE3kbVIE0iSKWi+X4gNbSynBzyAUUN2Q4+kYvIc3HPyolZAY/ gpuEGmF4QdGwW5uJ/tIbpW0PDqTY1rL8AtzH9vkkAu4RjC9RXi2EmeapP7i986T8 KJIJOGGQEpJNGPnd4z5GqMZpZWocJG+oQF4M/rNzg0KhbL+AwF9MwYBKLfJfzDzg == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=TFz2ZpeH x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; 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-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=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=TFz2ZpeH x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; 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-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=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932861AbeCCXb3 (ORCPT ); Sat, 3 Mar 2018 18:31:29 -0500 Received: from mail-bn3nam01on0139.outbound.protection.outlook.com ([104.47.33.139]:45280 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932856AbeCCWgM (ORCPT ); Sat, 3 Mar 2018 17:36:12 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Dedy Lansky , Maya Erez , Kalle Valo , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 168/219] wil6210: fix memory access violation in wil_memcpy_from/toio_32 Thread-Topic: [PATCH AUTOSEL for 4.9 168/219] wil6210: fix memory access violation in wil_memcpy_from/toio_32 Thread-Index: AQHTsz8bX0Ka0zyWu0KiV0qK0PQ5sA== Date: Sat, 3 Mar 2018 22:29:34 +0000 Message-ID: <20180303222716.26640-168-alexander.levin@microsoft.com> References: <20180303222716.26640-1-alexander.levin@microsoft.com> In-Reply-To: <20180303222716.26640-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;MW2PR2101MB1034;7:wEyP4WUPoLZcmRy5qyXR3G6gJ/+4PCPfK8XW4+cyX/SSZE5Jovk2Uz08BwIfmErx9qLRa+db0h59GyG+4GSAhIM6iHOye+gwoQ6A/hzCiav9EdvAu35j9N0ZwKenpI6ok1hLFR9XHxkWsdhXg1CwWbiX2su7hmruZ/0iRTZDNEST3w/fWVLn1HyWHXrKZK1mK2zHRlqqrs8n9PhZEiKhc1UTp1dP6d6PsdiEr9J0jakuvNzRnH3MBfjiseCO4Kqb x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 578770a5-95b2-476f-d52b-08d581572527 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1034; x-ms-traffictypediagnostic: MW2PR2101MB1034: 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)(6040501)(2401047)(5005006)(8121501046)(3231220)(944501244)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(61426038)(61427038)(6041288)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1034;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1034; x-forefront-prvs: 0600F93FE1 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(346002)(39860400002)(39380400002)(366004)(396003)(199004)(189003)(99286004)(22452003)(72206003)(316002)(3846002)(6116002)(186003)(26005)(478600001)(76176011)(54906003)(110136005)(102836004)(97736004)(1076002)(2501003)(3660700001)(66066001)(5250100002)(5660300001)(86362001)(10090500001)(10290500003)(86612001)(6506007)(68736007)(575784001)(106356001)(25786009)(8676002)(4326008)(59450400001)(6512007)(305945005)(2906002)(14454004)(107886003)(8936002)(7736002)(81166006)(3280700002)(53936002)(105586002)(81156014)(6666003)(6486002)(36756003)(2900100001)(6436002)(2950100002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1034;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: tMtQ+1bTghjBbnIHRiuOmoU/Bm2vqlLdCRer656OQBBugUS6h1aCC/BiIh8Uw/67vFjK9VCithmTx/YEyyUSWtojhppQQRPfQFh9LptfLNhteLWpJW0iKDppMUixWzoFiPY7qnPPhoR2Ld1QfwjkAHFC/fg032smW0Q6v1ymnws= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 578770a5-95b2-476f-d52b-08d581572527 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2018 22:29:34.9164 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1034 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: From: Dedy Lansky [ Upstream commit 0f6edfe2bbbb59d161580cb4870fcc46f5490f85 ] In case count is not multiple of 4, there is a read access in wil_memcpy_toio_32() from outside src buffer boundary. In wil_memcpy_fromio_32(), in case count is not multiple of 4, there is a write access to outside dst io memory boundary. Fix these issues with proper handling of the last 1 to 4 copied bytes. Signed-off-by: Dedy Lansky Signed-off-by: Maya Erez Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/wil6210/main.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless= /ath/wil6210/main.c index 24b07a0ce6f7..f8bce58d48cc 100644 --- a/drivers/net/wireless/ath/wil6210/main.c +++ b/drivers/net/wireless/ath/wil6210/main.c @@ -129,9 +129,15 @@ void wil_memcpy_fromio_32(void *dst, const volatile vo= id __iomem *src, u32 *d =3D dst; const volatile u32 __iomem *s =3D src; =20 - /* size_t is unsigned, if (count%4 !=3D 0) it will wrap */ - for (count +=3D 4; count > 4; count -=3D 4) + for (; count >=3D 4; count -=3D 4) *d++ =3D __raw_readl(s++); + + if (unlikely(count)) { + /* count can be 1..3 */ + u32 tmp =3D __raw_readl(s); + + memcpy(d, &tmp, count); + } } =20 void wil_memcpy_fromio_halp_vote(struct wil6210_priv *wil, void *dst, @@ -148,8 +154,16 @@ void wil_memcpy_toio_32(volatile void __iomem *dst, co= nst void *src, volatile u32 __iomem *d =3D dst; const u32 *s =3D src; =20 - for (count +=3D 4; count > 4; count -=3D 4) + for (; count >=3D 4; count -=3D 4) __raw_writel(*s++, d++); + + if (unlikely(count)) { + /* count can be 1..3 */ + u32 tmp =3D 0; + + memcpy(&tmp, s, count); + __raw_writel(tmp, d); + } } =20 void wil_memcpy_toio_halp_vote(struct wil6210_priv *wil, --=20 2.14.1