From patchwork Thu Mar 8 04:56:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130932 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6026816lja; Wed, 7 Mar 2018 20:56:05 -0800 (PST) X-Google-Smtp-Source: AG47ELvk+1lLk6ZqjV1/vZvUzjH4D34I5QwSKtmAxObk5quGD/j+u4muYJ5PZoWupg3YpWZvrLJA X-Received: by 10.99.176.68 with SMTP id z4mr19638619pgo.74.1520484964923; Wed, 07 Mar 2018 20:56:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520484964; cv=none; d=google.com; s=arc-20160816; b=mXfCIPqV8JRlpVK1jtHrNRAuFejZQTm4Q2GCMswXJ24aK4y1xLDsbFqp8O27MYKnsD LIE7I1YfdP1v+C09NAMmAZ/T0dUq5G52DPOLTTcira/WQUWQYaAhkuOpgZpFcW+VxB31 rCOp7GX5LV3Q2GNbjPyKqcz38QzTUKtqCXsMkIZfit2TdW6D03NZobLOkuzXdAaRwlCa 8X3hiOboA87TGe3I+ZqRhwOHz7mVv5qNUQWEMCr0aoVjeYDlXCJl6bcntcpeHJS3b5gI cSlwQUlalXLdDzKzYf/Gf0avDzTPdspVH5A9S7+ZPIQO5o7lv2FtNFBdBPLK4UyrnseY eH3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:message-id:date:thread-index:thread-topic:subject :cc:to:from:dkim-signature:arc-authentication-results; bh=OhmnnOTaa9e9fU5MRcReaNYh0W91I0DZrbsLG+whs4o=; b=APyL0qLUBHO685D6Xf+F2cwV5QXATFERM2povSX/p3CbQ8Per2nP+fvdvQ5ICpLPFz j1cAbQhYcB1ugtP8oy/YwsGzrk1O6sA4xOAFnWr1q2AfoJ+vTO0EF+xtw5GXfv2vTNgq PDcGJzCJdOo+trGjNp+dW/VQhlQwwu1vZPNv71k0TUhtwTqd2GLQ56iQOEyEgkfJwQXH oBG7r04ClSTMsTRBCOD9/BBc+ueQFNN3TJnkyAcatc6HY6o9JcNygk9P/0iIz8ukMPdb 5TCECSEXjoNDupMiWDT1YajxdJwuLJfiwqS1DTlyeHRp5hUrM6K4I25k9erRruC3RN72 FJjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=Ie3D+u5i; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f1-v6si2531534plt.696.2018.03.07.20.56.04; Wed, 07 Mar 2018 20:56:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=Ie3D+u5i; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754702AbeCHE4D (ORCPT + 10 others); Wed, 7 Mar 2018 23:56:03 -0500 Received: from mail-by2nam03on0095.outbound.protection.outlook.com ([104.47.42.95]:43489 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754570AbeCHE4C (ORCPT ); Wed, 7 Mar 2018 23:56:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=OhmnnOTaa9e9fU5MRcReaNYh0W91I0DZrbsLG+whs4o=; b=Ie3D+u5iPbzSjAUdi5ZN2YYMMJDd68F+CKuBCRSp+o2TsHPHQPUuuq2BVbvdY8Ge2KGD7a7nuYd7SuB2porE1XrDwCyYW6IVjk/7GRCxJMoRdl6NSC7d231Mhc9oB5q2m1BsZ2aEiTkP2rEBPBF6ghFoKkjOaBPcL3vXu8cwAVw= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0902.namprd21.prod.outlook.com (52.132.132.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.3; Thu, 8 Mar 2018 04:56:00 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0588.008; Thu, 8 Mar 2018 04:56:00 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Corey Minyard , Sasha Levin Subject: [PATCH AUTOSEL for 4.15 01/78] ipmi_si: Fix error handling of platform device Thread-Topic: [PATCH AUTOSEL for 4.15 01/78] ipmi_si: Fix error handling of platform device Thread-Index: AQHTtpnAUeZbEvl8XEOMf3gT0CPi9Q== Date: Thu, 8 Mar 2018 04:56:00 +0000 Message-ID: <20180308045525.7662-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; DM5PR2101MB0902; 7:ZuJOZ+T7rlC/ErGPvZzMFCKTA/RaZpxQQKVt+l6L7TGRKjRFjggDEgjx13+7U18vi3xB/eeKkhRjghon1v8ozAFqf1XlDsX3TZQDbhR5p5ZFhsOy/j5a96lytEnkGjyZ31zO+6JGRKRvMhUV9bRkDafolBjZ/iUQ0jjnzCCW8t6v68Dn3raqN5byXE4dsjfmFXSwuYV4AHSLBjfEFl02L1qE+62yU421ZDONE0ADxiekXy8Ml/CDqRVZJR8y/da/; 20:+hq91d9gMc8YDfkINgHyKkMsrHX2bpihf9pDvrfT0OUv6iNsorGac2TbdrEqJuzRT4aBZXM4JkwaYpLR9JpywBnDqM3+ZyLoo7Ko3H8ud5XdpJzsLrOpVmo9A48iCPgm6gCXxf/CLUUy0rdPXhjmqtbALo8l8nJ2CMVAX9eqF9Q= x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 49cb4b75-2c99-410f-82aa-08d584b0e379 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0902; x-ms-traffictypediagnostic: DM5PR2101MB0902: 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)(130873036417446)(194151415913766); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(10201501046)(3002001)(3231220)(944501244)(52105095)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB0902; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0902; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(39860400002)(39380400002)(376002)(366004)(396003)(189003)(199004)(8936002)(81156014)(81166006)(7736002)(5250100002)(8676002)(99286004)(26005)(107886003)(186003)(106356001)(10090500001)(575784001)(305945005)(66066001)(97736004)(2501003)(86362001)(3846002)(3660700001)(72206003)(6436002)(1076002)(6486002)(5660300001)(54906003)(110136005)(68736007)(53936002)(14454004)(36756003)(25786009)(478600001)(10290500003)(6506007)(2900100001)(102836004)(6512007)(22452003)(6116002)(316002)(4326008)(105586002)(86612001)(2906002)(3280700002)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0902; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: i+QaHnoDdEHiKrqXf7PQPZnO/nHZKs/ZVnhKb7P8ylpkcGNmIV+s9R/TULRncOzFiuU7VrWAGqWXSuamnMZpDfTqFOTjbBaLvo+kpKJholQg8kXOFsDeZ58UvnxayQ5ZJsmjY0QkacWBBKmiMCTeagiZikCNVAG6HOdDdEBgA3ipTUCfQU+YzG9ufHqDq9swL/fy3jbG82nqhX3hV6FxDdsXvfBmi48mKYQCTLY87weRtpVbetFgX4Qqcx+whNFGdXXEHPb7xuICFMu/J982LBpSg4cabGXiaQUh5dmWTgFd9ILStTaUStFlT3LuYRWSaxzFqIOypogY5w5JUSZlsA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 49cb4b75-2c99-410f-82aa-08d584b0e379 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:56:00.6804 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0902 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Corey Minyard [ Upstream commit 174134ac760275457bb0d1560a0dbe6cf8a12ad6 ] Cleanup of platform devices created by the IPMI driver was not being done correctly and could result in a memory leak. So create a local boolean to know how to clean up those platform devices. Reported-by: David Binderman Signed-off-by: Corey Minyard Signed-off-by: Sasha Levin --- drivers/char/ipmi/ipmi_si_intf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.14.1 diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 71fad747c0c7..7499b0cd8326 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -2045,6 +2045,7 @@ static int try_smi_init(struct smi_info *new_smi) int rv = 0; int i; char *init_name = NULL; + bool platform_device_registered = false; pr_info(PFX "Trying %s-specified %s state machine at %s address 0x%lx, slave address 0x%x, irq %d\n", ipmi_addr_src_to_str(new_smi->io.addr_source), @@ -2173,6 +2174,7 @@ static int try_smi_init(struct smi_info *new_smi) rv); goto out_err; } + platform_device_registered = true; } dev_set_drvdata(new_smi->io.dev, new_smi); @@ -2279,10 +2281,11 @@ static int try_smi_init(struct smi_info *new_smi) } if (new_smi->pdev) { - platform_device_unregister(new_smi->pdev); + if (platform_device_registered) + platform_device_unregister(new_smi->pdev); + else + platform_device_put(new_smi->pdev); new_smi->pdev = NULL; - } else if (new_smi->pdev) { - platform_device_put(new_smi->pdev); } kfree(init_name);