From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1145125-1520116565-2-270586181573572227 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=1520116564; b=KweXeH8XUrYIxV0tzfvvTJXs6O+HSBaA8RtgsZNFiObaYxL Qq1YgFGGD3nyXj0VMMc+UZSf6ASZVKycuRfpaLXpDWD5woGw+WfUBTcQ5dmy4yEa /xTDJ/gGTaL2MHhfvcJRByvKz1m/nJOxC/Nb7DbRF4wEzmY3v2ttloawQGgf2xNV ytQK2YYE7ceD7s9EnvULw5bjoErsZP69daizNc9kaojm9CbB7jMnzOYAd0L/gWZv NXyUOK64EWYuk0biWRr8AiRdf0UhdI/R4etM+5iTLbgzmVCz/rpWCBCs8Dtw0fjT nM8oGpE2QC9XU20ebQDfSazXHpz8szlU2f0W2zw== 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=1520116564; bh=7mk7dN jFm/D+1YKZYgoaT56ARq3RQ8SGQoUlRzpy2jc=; b=n1gPsC3fxHl4SWK/lpKb7g OHSEN1igw6/eYGO30ODueoXJhnQ3xldjN0dXL8Qyq64xIbFXTzniyM+4lkQRMFXr K5ZbO4ApjKwbiMI6dnHoWvY/AaYYPmMP321a23plbupYqUaDuVnus7jnfot71W4j 52SgpJ5JG3T6+31j9R9zxCZF+0hDlogRr5+xgEl+QYqAjvkSWyznP2/fdbw4/Du6 txTTClPEaU95K1J2ZUiLiuCMhISO7w4t9ACgGjsVSPkjwsmSfvj6O7ElaghBv2p0 wyAIJGZ5CZ9PydW5DrGs9fyalCGwhNAO0kBVtCPNFZZDkkLuhabyYM9hSgO9vkRg == ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=XCF9mEnd 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: mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=XCF9mEnd 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 S934470AbeCCWf5 (ORCPT ); Sat, 3 Mar 2018 17:35:57 -0500 Received: from mail-bn3nam01on0090.outbound.protection.outlook.com ([104.47.33.90]:43384 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933950AbeCCWfx (ORCPT ); Sat, 3 Mar 2018 17:35:53 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Hannes Reinecke , Hannes Reinecke , "Martin K . Petersen" , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 157/219] scsi: sg: close race condition in sg_remove_sfp_usercontext() Thread-Topic: [PATCH AUTOSEL for 4.9 157/219] scsi: sg: close race condition in sg_remove_sfp_usercontext() Thread-Index: AQHTsz8XzS/2fURCLUeKAmp1feheug== Date: Sat, 3 Mar 2018 22:29:28 +0000 Message-ID: <20180303222716.26640-157-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:lbpMI+ed9NWDJCx8D+zyMPhjUkPdLcnbdsirv5grHeBAYQUgvBsGOEAcBy7XKk3F/LN7OK+X/K/xtONJh+tYrkIRgfwU8dxUIkUXhWDknqCYrCC/YQ+O/pyyd6iMcHAYhQ0DBJLrLFgYiJ+BVZGrJHmCCBopRHN86l27FOvVEe+hYpq9//lyEk9XTqaZPI7Y7JSP+lDf3fo0ALhbS7Jw/bN1OF0RCLX4EVn3DoQafxVkqo6zqd/yKTcM8C4jeNkN x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 8eddea73-c341-44f8-c458-08d58157197e 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)(146099531331640); 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: CFHv1XFZkZIvJXWTkVemqielqrbWCEDkxIZMzRBjifccRMx6Y9gEAuSgS8QB6uXOZgYUxUsCQjvRwnxXbjm5T5yZbmOsPhLgDbX3CUZBH0+aU4PH5xM+EopewMwZ8/9XMb46q847vFQy+vzGuefLFyhJTWxJmImEq+tOT5IIrxA= 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: 8eddea73-c341-44f8-c458-08d58157197e X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2018 22:29:28.1038 (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: Hannes Reinecke [ Upstream commit 97d27b0dd015e980ade63fda111fd1353276e28b ] sg_remove_sfp_usercontext() is clearing any sg requests, but needs to take 'rq_list_lock' when modifying the list. Reported-by: Christoph Hellwig Signed-off-by: Hannes Reinecke Reviewed-by: Johannes Thumshirn Tested-by: Johannes Thumshirn Reviewed-by: Christoph Hellwig Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/sg.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 6b6064dc3467..e6333cae8550 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -524,6 +524,7 @@ sg_read(struct file *filp, char __user *buf, size_t cou= nt, loff_t * ppos) } else count =3D (old_hdr->result =3D=3D 0) ? 0 : -EIO; sg_finish_rem_req(srp); + sg_remove_request(sfp, srp); retval =3D count; free_old_hdr: kfree(old_hdr); @@ -564,6 +565,7 @@ sg_new_read(Sg_fd * sfp, char __user *buf, size_t count= , Sg_request * srp) } err_out: err2 =3D sg_finish_rem_req(srp); + sg_remove_request(sfp, srp); return err ? : err2 ? : count; } =20 @@ -800,6 +802,7 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp, SCSI_LOG_TIMEOUT(1, sg_printk(KERN_INFO, sfp->parentdp, "sg_common_write: start_req err=3D%d\n", k)); sg_finish_rem_req(srp); + sg_remove_request(sfp, srp); return k; /* probably out of space --> ENOMEM */ } if (atomic_read(&sdp->detaching)) { @@ -812,6 +815,7 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp, } =20 sg_finish_rem_req(srp); + sg_remove_request(sfp, srp); return -ENODEV; } =20 @@ -1302,6 +1306,7 @@ sg_rq_end_io_usercontext(struct work_struct *work) struct sg_fd *sfp =3D srp->parentfp; =20 sg_finish_rem_req(srp); + sg_remove_request(sfp, srp); kref_put(&sfp->f_ref, sg_remove_sfp); } =20 @@ -1846,8 +1851,6 @@ sg_finish_rem_req(Sg_request *srp) else sg_remove_scat(sfp, req_schp); =20 - sg_remove_request(sfp, srp); - return ret; } =20 @@ -2194,12 +2197,17 @@ sg_remove_sfp_usercontext(struct work_struct *work) struct sg_fd *sfp =3D container_of(work, struct sg_fd, ew.work); struct sg_device *sdp =3D sfp->parentdp; Sg_request *srp; + unsigned long iflags; =20 /* Cleanup any responses which were never read(). */ + write_lock_irqsave(&sfp->rq_list_lock, iflags); while (!list_empty(&sfp->rq_list)) { srp =3D list_first_entry(&sfp->rq_list, Sg_request, entry); sg_finish_rem_req(srp); + list_del(&srp->entry); + srp->parentfp =3D NULL; } + write_unlock_irqrestore(&sfp->rq_list_lock, iflags); =20 if (sfp->reserve.bufflen > 0) { SCSI_LOG_TIMEOUT(6, sg_printk(KERN_INFO, sdp, --=20 2.14.1