From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-858731-1516768531-2-1710422706278604231 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, 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=1516768530; b=RHR53IhO+wwmEiz0yxTyOL9t9MZmSSS7NO6KK3zZhj/HWpw lUT6fMBNpBX2E4KEC77V0mj7XRhJgvp3pxgR1Pidcyt8f0f3ceQJjGFWbJcKfmBu 4n5wMs0dVemLDvCQSbmx7d+ManPL+YNvYCg7+1Qr7W4ysqN8Th3HnmnEFYuDfEj3 9aSfEWIagaSDttNdVy/6hfgWpOeHB/lWU5dtt/S59zV3v0Pq/JTx01eyEF6ozrgV 2oDWmberpVbGGYM08LGqdkiMX2MwUjmSg03Mu8VqcZGp3PKLtjTYQ5EXs126pkQ7 qzH1VotSRyaCtGco2TDcWrVdaN6EQqZDcMCyvUQ== 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=1516768530; bh=Xmzmxv HyUCOcS/RMNFlwylDymLlcSWftTlLvHw65wm0=; b=aiFCwV3uSESsjwfxkl5Ldh A2TjVEVM2hHmg+zbJCKWPBURozx2ZJ8x1NUZzlF2C6AwvgWDJ+1iUYZ/EK0h4uBr Xk24AwhwFQ/C/s/ObmsuOH9IetuIUzW917VODjPdDj1N9UT/KYC6uAYYNCSu7Thz xm1uVr78rBJOTMtMKR0X9M9Aac8Zp4tuuShDGZTc9Vz1MbpvregSzwXYx7ckYUAm kobOrD+c5tqM6zJOcZH0v4IPOqL00RgcKcJKviYjOJlvdGAwWNXa2ma+7kv/7Nfe +dWyVcPjbVlRett3GgaNSHAO600+psreMKO6OiJWfs1vGsp12EXcPVSMLsQQb1xQ == ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=JN4LoxFq 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: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=JN4LoxFq 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 S932924AbeAXEez (ORCPT ); Tue, 23 Jan 2018 23:34:55 -0500 Received: from mail-by2nam03on0127.outbound.protection.outlook.com ([104.47.42.127]:16377 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933070AbeAXESq (ORCPT ); Tue, 23 Jan 2018 23:18:46 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: "Guilherme G. Piccoli" , "Martin K . Petersen" , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 49/55] scsi: aacraid: Prevent crash in case of free interrupt during scsi EH path Thread-Topic: [PATCH AUTOSEL for 4.9 49/55] scsi: aacraid: Prevent crash in case of free interrupt during scsi EH path Thread-Index: AQHTlMoHmHJnjI9PxEitrZu1bNhwag== Date: Wed, 24 Jan 2018 04:15:55 +0000 Message-ID: <20180124041521.32223-49-alexander.levin@microsoft.com> References: <20180124041521.32223-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041521.32223-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;DM5PR2101MB1032;6:EYwXXGh9JMVK7uF4/oZkQIddv9nFNY1/1Rp9sVWGm2Octve/via8h+umY9MAOIk1okgcvclaEhFVhNFhuO6dJ9cruMdzqJ0ZfMWIqI8Ze415mfYFiRVNaV4fUdWAfCZKGwbjhWZhtEghtgkVaF5ER8EBgmdVKd7X+mA+XxkL2TrOIVe2qT1Au0z2gYutWrfIhzepFLqjKrBJu21FfX5L+MzudyNPFMa+BuF808XYMiqoYN1B4wZZancX6+iNcW6eOOgcwy1Q83BxmD3Mx/gzSQmD/22ojd0x2UGHTI0d8HC07YnTz5svFmsu0fOhXA7mn2VVlQ5lMJLQRpwZndas21d9IFA3X0gUL0x1QCKHxxF85qcfwVIvN7oVI7YfKVhH;5:gBHFTHWUvVqTEhWEmE//ljgFlcXAf78p49kMi4Vw/G5CgZhYv1CpS3ANgIJrSjDd5jicjE+DTqgG4sUBT+IH4I4zq3kcZV+hyNrNXZTuzPTBpMCU3fg9eoT+3LmeZfneISqkVbSasZ2ZX61iFxiCWdRPIpmCMVjqwyrTkxf/tfA=;24:VjfU2YZ+bJWs0uEC7nIrv17NHjihvtlp8jq92ulNb1d1GLEDlW5H4C7QeYSQqA1NTf0IviwDyGBb+Ce8dcPzTxxaxBdPlXyKH2MhalSk/Ac=;7:HCE3hQ+DR/Ck49/a1kNfy0wswg6DoaCJUkLTEqQ+Hv0p1z9lV45obYQAbSqxqxi3mSJKis6vMkxiZMasfZ7873L5ZaOrpxTjHQoPVixPGNo4dkkVdFlL2AnXVZMm84vq/piAia+OWTL9jG83jhmI654Qwi2p5+c04z0QdmU5GknTyvWBYBzIneRZMF4yR81AyIdwUmU2FCEQiH+Je1HGoiJptNasdKnzwBZPw9P+OeV8Ytg9V3xZEu8jR5AR3VxC x-ms-office365-filtering-correlation-id: e9062b16-09f9-4765-899d-08d562e18c8b x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020);SRVR:DM5PR2101MB1032; x-ms-traffictypediagnostic: DM5PR2101MB1032: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(72170198267865)(104084551191319)(146099531331640); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231046)(2400081)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR2101MB1032;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1032; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(396003)(39860400002)(376002)(346002)(39380400002)(189003)(199004)(36756003)(478600001)(6506007)(8676002)(14454004)(6512007)(53936002)(5660300001)(26005)(72206003)(4326008)(25786009)(81156014)(81166006)(8936002)(86362001)(59450400001)(10290500003)(68736007)(2906002)(6346003)(99286004)(6666003)(86612001)(76176011)(6436002)(102836004)(7736002)(2950100002)(66066001)(1076002)(10090500001)(54906003)(22452003)(316002)(105586002)(106356001)(5250100002)(305945005)(2501003)(3846002)(3280700002)(97736004)(2900100001)(6486002)(6116002)(110136005)(3660700001)(107886003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1032;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: dkcVtP7qXiAziqBxHdD/mecderKdJg20rkUtlYvNYTAgWZTPozBUVk+u4zsBHxpg4/UsJo54VyX6iCo0y1/SnA== 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: e9062b16-09f9-4765-899d-08d562e18c8b X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:15:55.3713 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1032 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: "Guilherme G. Piccoli" [ Upstream commit e4717292ddebcfe231651b5aff9fa19ca158d178 ] As part of the scsi EH path, aacraid performs a reinitialization of the adapter, which encompass freeing resources and IRQs, NULLifying lots of pointers, and then initialize it all over again. We've identified a problem during the free IRQ portion of this path if CONFIG_DEBUG_SHIRQ is enabled on kernel config file. Happens that, in case this flag was set, right after free_irq() effectively clears the interrupt, it checks if it was requested as IRQF_SHARED. In positive case, it performs another call to the IRQ handler on driver. Problem is: since aacraid currently free some resources *before* freeing the IRQ, once free_irq() path calls the handler again (due to CONFIG_DEBUG_SHIRQ), aacraid crashes due to NULL pointer dereference with the following trace: aac_src_intr_message+0xf8/0x740 [aacraid] __free_irq+0x33c/0x4a0 free_irq+0x78/0xb0 aac_free_irq+0x13c/0x150 [aacraid] aac_reset_adapter+0x2e8/0x970 [aacraid] aac_eh_reset+0x3a8/0x5d0 [aacraid] scsi_try_host_reset+0x74/0x180 scsi_eh_ready_devs+0xc70/0x1510 scsi_error_handler+0x624/0xa20 This patch prevents the crash by changing the order of the deinitialization in this path of aacraid: first we clear the IRQ, then we free other resources. No functional change intended. Signed-off-by: Guilherme G. Piccoli Reviewed-by: Raghava Aditya Renukunta Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/aacraid/commsup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.= c index 0aeecec1f5ea..e2962f15c189 100644 --- a/drivers/scsi/aacraid/commsup.c +++ b/drivers/scsi/aacraid/commsup.c @@ -1416,13 +1416,13 @@ static int _aac_reset_adapter(struct aac_dev *aac, = int forced) * will ensure that i/o is queisced and the card is flushed in that * case. */ + aac_free_irq(aac); aac_fib_map_free(aac); pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr, aac->comm_= phys); aac->comm_addr =3D NULL; aac->comm_phys =3D 0; kfree(aac->queues); aac->queues =3D NULL; - aac_free_irq(aac); kfree(aac->fsa_dev); aac->fsa_dev =3D NULL; quirks =3D aac_get_driver_ident(index)->quirks; --=20 2.11.0