From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3607359-1523234473-2-13756237042826549250 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 enda, 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=fm2; t= 1523234473; b=DrUHOqS4L8ocKdeYHrn4Tp50nM25qoPOnCvf5ib05N7WuITS8M lAgkk1hGTIvX15X/jBkbmETrxe76KhGT1fpNmT05sMf85lnGrmdW/qyyOZ5Nx/Nh WobnYeG4uktQNAAQlzqYE6eDE5sCs/BSA2l6oIMy95xeaSHXjLuPN0qc8psq2YNY EKERiKrnI2TZClS/98ds7a+Nasa7wAv1XYbiQDK2VXGEieV9vdl3P6iefZxQX26Z s2HxrSyZzq4BHpcPIgqx5pdrJVK3136uOhZEM4E3HF2lbwkGZ/IPjom33noCzwX+ 5OXdGkrbsfvfyOrCWrRSRVuWzdTXftTyB5Wg== 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=fm2; t=1523234473; bh=yAVfl2ip7v cDFPJXAghOUIxZOB0YyMkqVK+4Frdj7gY=; b=XgPU/30yxgMIQgJgsfyrQO9q57 Kbe5HjVFNJZnsIzJnyqxuK+ZakkAOnsJtVOzwlN0q6ms+rZ0MUFXmrxa41Vj61wf /+KJlFZxJGxmLJPRQWViY1YbpaITCJo3Y8QpmY8vpFFeCNGfOq8S4a+ZPhIhnDx4 Vup5MaeOs6zouBesdFH4l8Baey1GTF8hg8k0fd+X6czws53ZzelLujPghoG1CpmQ i5hXiZXbqT1afFYRd+Xkft3eYd/J8HMIpFRV/mYEMbXfGg4nu3c6o2k4s3DPh/4o Qlgl+CZ1opQzNjfSANztna+N6U8GJJi9OQABItYQ8ws4FAuMULAPkxS1lp0g== ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=Z60NHrsj 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-cm=none score=0; 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; x-vs=clean score=-100 state=0 Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=Z60NHrsj 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-cm=none score=0; 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; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfAIVzRGGwA7YaNas61woZg7bwlDkCoi1rDyka1cenOfryzHHVElglYEchBgOe8fQsemPuGhueLwqWd62c4yTcUa8yOeUhx7sg5qVHXUPDVjlJNBXBgO2 Dwd+UQqVSdnmfxRLV4aNMOZabrDhKv66Je5qeMSMuDrxAIxJe60Z22KEsgp4nOR3PAkIhiRmQ7snGwQbrDcRurpkjMQqg3puLcsvz/5rpL/6hx97aeJm4C/r X-CM-Analysis: v=2.3 cv=NPP7BXyg c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=wRwT6uffUbIA:10 a=t_PdEiP4ckcA:10 a=mw6kJ3eo-EIA:10 a=8nJEP1OIZ-IA:10 a=xqWC_Br6kY4A:10 a=Kd1tUaAdevIA:10 a=Lf-vpJhqX20A:10 a=VwQbUJbxAAAA:8 a=yPCof4ZbAAAA:8 a=yMhMjlubAAAA:8 a=Z5yqLHp-0Zm_W5QtMCIA:9 a=wPNLvfGTeEIA:10 a=AjGcO6oz07-iQ99wixmX:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932518AbeDIAlJ (ORCPT ); Sun, 8 Apr 2018 20:41:09 -0400 Received: from mail-sn1nam02on0130.outbound.protection.outlook.com ([104.47.36.130]:38544 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933325AbeDIAka (ORCPT ); Sun, 8 Apr 2018 20:40:30 -0400 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Johan Hovold , "Martin K . Petersen" , Sasha Levin Subject: [PATCH AUTOSEL for 3.18 051/101] scsi: sun_esp: fix device reference leaks Thread-Topic: [PATCH AUTOSEL for 3.18 051/101] scsi: sun_esp: fix device reference leaks Thread-Index: AQHTz5q+gQqAjHyNZ0K3ZksnBQk4xw== Date: Mon, 9 Apr 2018 00:36:06 +0000 Message-ID: <20180409003505.164715-51-alexander.levin@microsoft.com> References: <20180409003505.164715-1-alexander.levin@microsoft.com> In-Reply-To: <20180409003505.164715-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;DM5PR2101MB0870;7:wrR2MZMzdKrNk1Sm9ni8klcFGdC/uQi0mUBrD96k0mxFkSXQvQrJLsGMHsEwF3UujBdnvaXK/7spSsSu2rw959LEiL++rhmAhvsdlTMY5vt2wm8NYLxq0XhOYlvCFgPcgTC770x9PYRhAVq0nfMLkUXKAateuWBSyPieuKAgiCtcZ9WpT6fuU9xoGEMy6sSAdAQvPZRSUKakk3bhnIECcPIX4parNWSdsjmbOpRnkjCYjYyX1oNw7hBNkujpEmJ3;20:5z0JWva7Mo0/wShYjJG1P31td3Z6tO1gcd+F8edyQ2pQ6TmMCsywdhTtfbLjjNjbyy0/DWA+/iwl8SW5poMdSOfj3FcvIMIUAwyUq6DJFB618mU6SA1NR5hP4piSSeZHmvbr3vZt6+7nMWQAyUYteXtg+76yviYkXuxg2Rsd+J0= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 0e2fb4b3-7621-462d-736c-08d59db27c78 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB0870; x-ms-traffictypediagnostic: DM5PR2101MB0870: 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)(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231221)(944501327)(52105095)(93006095)(93001095)(6055026)(61426038)(61427038)(6041310)(20161123558120)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB0870;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0870; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39380400002)(396003)(366004)(376002)(39860400002)(346002)(199004)(189003)(5250100002)(5660300001)(26005)(10290500003)(2501003)(478600001)(68736007)(8676002)(8936002)(81156014)(81166006)(22452003)(3846002)(86362001)(36756003)(1076002)(305945005)(54906003)(72206003)(186003)(316002)(4326008)(25786009)(6486002)(110136005)(7736002)(446003)(10090500001)(76176011)(14454004)(11346002)(476003)(2900100001)(97736004)(107886003)(486006)(59450400001)(2906002)(6512007)(53936002)(102836004)(2616005)(86612001)(6116002)(3280700002)(6666003)(6506007)(66066001)(6436002)(3660700001)(105586002)(99286004)(106356001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0870;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; x-microsoft-antispam-message-info: FYAARAQlWmrIq6ivu/qxHo7PaEyKaBjugOHLssnNXrTRYPfBvUbYM/jkGcvinFQlzxhOBpMo9pWZUqhrLkga1BLWfzdOn/IdIUHugw48Th8gFMYjKBCl1jjvWAg0xrZu1j7nsuKlm9PaH4ZCnHAAq071qARj44C0GmC9IW66HRz2CfVSmJDEye0+IZb1Mndl/PQ+RxkJMtHsuYrFWOs+cIh9iye2MchD54kZA5IOd1UZgcGv6R2ChL5vxwCM3GXjkgPtLBQxV2idE15LKGJ1aM6MkBaJatoEVtw/Y4jydbKOBBOaPzbpGz1np7KCGznfrwjTxIoaXr85k4MMYOS4Atsej1xPur8AHW7xQMJ7kKC5ip1bV9dcr2coJLao47GDUfGWfNgSbB41OCGLVEe8+4FnciGoQY59v6kCI0Zlwe0= 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: 0e2fb4b3-7621-462d-736c-08d59db27c78 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:36:06.1265 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0870 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: Johan Hovold [ Upstream commit f62f9ffdb5ef683ef8cffb43932fa72cc3713e94 ] Make sure to drop the reference to the dma device taken by of_find_device_by_node() on probe errors and on driver unbind. Fixes: 334ae614772b ("sparc: Kill SBUS DVMA layer.") Signed-off-by: Johan Hovold Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/sun_esp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/sun_esp.c b/drivers/scsi/sun_esp.c index f2e68459f7ea..6585d75bf732 100644 --- a/drivers/scsi/sun_esp.c +++ b/drivers/scsi/sun_esp.c @@ -566,6 +566,7 @@ static int esp_sbus_probe(struct platform_device *op) struct device_node *dp =3D op->dev.of_node; struct platform_device *dma_of =3D NULL; int hme =3D 0; + int ret; =20 if (dp->parent && (!strcmp(dp->parent->name, "espdma") || @@ -580,7 +581,11 @@ static int esp_sbus_probe(struct platform_device *op) if (!dma_of) return -ENODEV; =20 - return esp_sbus_probe_one(op, dma_of, hme); + ret =3D esp_sbus_probe_one(op, dma_of, hme); + if (ret) + put_device(&dma_of->dev); + + return ret; } =20 static int esp_sbus_remove(struct platform_device *op) @@ -613,6 +618,8 @@ static int esp_sbus_remove(struct platform_device *op) =20 dev_set_drvdata(&op->dev, NULL); =20 + put_device(&dma_of->dev); + return 0; } =20 --=20 2.15.1