From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372483-1517178962-2-2337870168009326195 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.001, 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='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=1517178962; b=QS9szc8fmffZLLMl5Pzvr9yc6cot3xOMxwcYv1nJij4P8o2 MMyS5OQtctjnMtfweJZ3GtJuBmyj1qzJLEpqFL9Ni+2eHE4q4Wm9Fj0mCqfWRyO3 nLspnExLaNQQBmFQZrE4VuKi6gdmk+FdJRKmOhHlb7n9Gx4HiFhUxY80Lr6Q411Z N8iTr0/ZYhj5ymkSSRCZHelgYIF+8cNKGCSpPxBbUxGSB0Mi2jjM5d3+7XEF6tIH XWyt+MLZXF52kHAtKnbCocHOcvuyM7yui3xrWViOWuqIM29D/ftrr/Fw73lq5O/I tzXhJ4o4/NsL+/ykN9uwyaHyoMpDdZ2jvg/khgQ== 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=1517178962; bh=2MXlru nfxYbaaUYhJsDIV00PPiCE9qrUx3/lirCj0Qo=; b=uy93hwzc0CezGopL0oU23M 3I1LF0Zcnnt+ERGDR7hD83/j3sm/3Cf10LMfHdxhXu/UFJKE9WGvbfm6oTDbijoi 8jpuELOr7JYRVG6lc3Bz6BNjKwkbpiWCkcZtsLCbcQUV4nug5t3J2WtF9RBEbvxZ A3HQp08pJFWpFAlUQP25av1lVs1DpLdcnUOqSwlFDo1AQvkD/obkJGcLC56fTeOJ reKrUxhFrgpXXysK4w4lrzdhUIIEAaWjdd7H3IWft4LlTT6XgKHe9qbDeaYpa1qS dMCQGmIARjapJTFaJBlasXGYR+Np2U0yYnfIQIC7FgtfrzmbigIwrcgO/JiqxJjg == 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=jiL7susq 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=jiL7susq 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 S1753437AbeA1Wae (ORCPT ); Sun, 28 Jan 2018 17:30:34 -0500 Received: from mail-by2nam03on0092.outbound.protection.outlook.com ([104.47.42.92]:41884 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753427AbeA1Wa3 (ORCPT ); Sun, 28 Jan 2018 17:30:29 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Jia-Ju Bai , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 36/36] hippi: Fix a Fix a possible sleep-in-atomic bug in rr_close Thread-Topic: [PATCH AUTOSEL for 4.4 36/36] hippi: Fix a Fix a possible sleep-in-atomic bug in rr_close Thread-Index: AQHTmIdfO8q7Gl4kNUqqmGn2xf2Yaw== Date: Sun, 28 Jan 2018 22:28:51 +0000 Message-ID: <20180128222815.29479-36-alexander.levin@microsoft.com> References: <20180128222815.29479-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222815.29479-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;MW2PR2101MB1114;7:dS3AL0xVv6l4lgW1Wyh37EtEo2tnubTodgJuP/qYRu/uXxephEBCnoxhDAr/9ALjQ5pxaYW8XJUkn3YzhSut47YFviVCOyH7SL3+AO2b0rX4VYpWFjAHyvBhI8y4KgMZqcHsqNlKkKkGk2GhIkgMSBxVK/So8HYnrFQk+JxsgGqCcG2qWOQyxV7ImZU2Ko+oZD5tAOLuyq/wEIg+ed/0sd6CTvAaz5CeL3sdpmkH8yZsPuYW3SCtzVOVNSmsXlrp x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 82381a73-64de-4ace-ccba-08d5669ebad7 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1114; x-ms-traffictypediagnostic: MW2PR2101MB1114: 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)(130843839470238); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011);SRVR:MW2PR2101MB1114;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1114; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(396003)(39380400002)(39860400002)(346002)(366004)(189003)(199004)(305945005)(186003)(110136005)(26005)(81156014)(7736002)(8936002)(6506007)(102836004)(81166006)(6116002)(3846002)(316002)(1076002)(6486002)(6436002)(105586002)(22452003)(72206003)(3660700001)(2950100002)(14454004)(107886003)(6666003)(59450400001)(10290500003)(99286004)(68736007)(2906002)(97736004)(478600001)(3280700002)(76176011)(8676002)(54906003)(86612001)(10090500001)(36756003)(575784001)(86362001)(2900100001)(5660300001)(25786009)(4326008)(5250100002)(6512007)(53936002)(106356001)(2501003)(66066001)(22906009)(31853002)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1114;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: OaxjfCR0iMNWszrKBJiroDz/qL2vkuHXrKP3/VChIxUi3dNCLrJQyxLKvxFVDzXr8HlpfaVDp4i2LJWYfwjt5Q== 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: 82381a73-64de-4ace-ccba-08d5669ebad7 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:28:51.1094 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1114 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: Jia-Ju Bai [ Upstream commit 6e266610eb6553cfb7e7eb5d11914bd01509c406 ] The driver may sleep under a spinlock. The function call path is: rr_close (acquire the spinlock) free_irq --> may sleep To fix it, free_irq is moved to the place without holding the spinlock. This bug is found by my static analysis tool(DSAC) and checked by my code r= eview. Signed-off-by: Jia-Ju Bai Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/hippi/rrunner.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c index 95c0b45a68fb..313e006f74fe 100644 --- a/drivers/net/hippi/rrunner.c +++ b/drivers/net/hippi/rrunner.c @@ -1381,8 +1381,8 @@ static int rr_close(struct net_device *dev) rrpriv->info_dma); rrpriv->info =3D NULL; =20 - free_irq(pdev->irq, dev); spin_unlock_irqrestore(&rrpriv->lock, flags); + free_irq(pdev->irq, dev); =20 return 0; } --=20 2.11.0