From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [4.9,53/94] EDAC: Fix memleak in module init error path From: Greg Kroah-Hartman Message-Id: <20181002132504.183267086@linuxfoundation.org> Date: Tue, 2 Oct 2018 06:25:07 -0700 To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold , Denis Kirjanov , Mauro Carvalho Chehab , linux-edac , Borislav Petkov , Sasha Levin List-ID: NC45LXN0YWJsZSByZXZpZXcgcGF0Y2guICBJZiBhbnlvbmUgaGFzIGFueSBvYmplY3Rpb25zLCBw bGVhc2UgbGV0IG1lIGtub3cuCgotLS0tLS0tLS0tLS0tLS0tLS0KCkZyb206IEpvaGFuIEhvdm9s ZCA8am9oYW5Aa2VybmVsLm9yZz4KClsgVXBzdHJlYW0gY29tbWl0IDQ3MDhhYTg1ZDUwY2M2ZTk2 MmRmYThhY2Y1YWQ0ZTBkMjkwYTIxZGIgXQoKTWFrZSBzdXJlIHRvIHVzZSBwdXRfZGV2aWNlKCkg dG8gZnJlZSB0aGUgaW5pdGlhbGlzZWQgc3RydWN0IGRldmljZSBzbwp0aGF0IHJlc291cmNlcyBt YW5hZ2VkIGJ5IGRyaXZlciBjb3JlIGFsc28gZ2V0cyByZWxlYXNlZCBpbiB0aGUgZXZlbnQgb2YK YSByZWdpc3RyYXRpb24gZmFpbHVyZS4KClNpZ25lZC1vZmYtYnk6IEpvaGFuIEhvdm9sZCA8am9o YW5Aa2VybmVsLm9yZz4KQ2M6IERlbmlzIEtpcmphbm92IDxraXJqYW5vdkBnbWFpbC5jb20+CkNj OiBNYXVybyBDYXJ2YWxobyBDaGVoYWIgPG1jaGVoYWJAa2VybmVsLm9yZz4KQ2M6IGxpbnV4LWVk YWMgPGxpbnV4LWVkYWNAdmdlci5rZXJuZWwub3JnPgpGaXhlczogMmQ1NmIxMDllM2E1ICgiRURB QzogSGFuZGxlIGVycm9yIHBhdGggaW4gZWRhY19tY19zeXNmc19pbml0KCkgcHJvcGVybHkiKQpM aW5rOiBodHRwOi8vbGttbC5rZXJuZWwub3JnL3IvMjAxODA2MTIxMjQzMzUuNjQyMC0xLWpvaGFu QGtlcm5lbC5vcmcKU2lnbmVkLW9mZi1ieTogQm9yaXNsYXYgUGV0a292IDxicEBzdXNlLmRlPgpT aWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8YWxleGFuZGVyLmxldmluQG1pY3Jvc29mdC5jb20+ ClNpZ25lZC1vZmYtYnk6IEdyZWcgS3JvYWgtSGFydG1hbiA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlv bi5vcmc+Ci0tLQogZHJpdmVycy9lZGFjL2VkYWNfbWNfc3lzZnMuYyB8ICAgIDYgKysrLS0tCiAx IGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKLS0tIGEvZHJp dmVycy9lZGFjL2VkYWNfbWNfc3lzZnMuYworKysgYi9kcml2ZXJzL2VkYWMvZWRhY19tY19zeXNm cy5jCkBAIC0xMDU5LDE0ICsxMDU5LDE0IEBAIGludCBfX2luaXQgZWRhY19tY19zeXNmc19pbml0 KHZvaWQpCiAKIAllcnIgPSBkZXZpY2VfYWRkKG1jaV9wZGV2KTsKIAlpZiAoZXJyIDwgMCkKLQkJ Z290byBvdXRfZGV2X2ZyZWU7CisJCWdvdG8gb3V0X3B1dF9kZXZpY2U7CiAKIAllZGFjX2RiZygw LCAiZGV2aWNlICVzIGNyZWF0ZWRcbiIsIGRldl9uYW1lKG1jaV9wZGV2KSk7CiAKIAlyZXR1cm4g MDsKIAotIG91dF9kZXZfZnJlZToKLQlrZnJlZShtY2lfcGRldik7Cisgb3V0X3B1dF9kZXZpY2U6 CisJcHV0X2RldmljZShtY2lfcGRldik7CiAgb3V0OgogCXJldHVybiBlcnI7CiB9Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38159C43143 for ; Tue, 2 Oct 2018 13:37:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F19C42064D for ; Tue, 2 Oct 2018 13:37:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F19C42064D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387751AbeJBUUo (ORCPT ); Tue, 2 Oct 2018 16:20:44 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:36690 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387680AbeJBUUo (ORCPT ); Tue, 2 Oct 2018 16:20:44 -0400 Received: from localhost (24-104-73-23-ip-static.hfc.comcastbusiness.net [24.104.73.23]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 82369B4B; Tue, 2 Oct 2018 13:37:19 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold , Denis Kirjanov , Mauro Carvalho Chehab , linux-edac , Borislav Petkov , Sasha Levin Subject: [PATCH 4.9 53/94] EDAC: Fix memleak in module init error path Date: Tue, 2 Oct 2018 06:25:07 -0700 Message-Id: <20181002132504.183267086@linuxfoundation.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181002132500.494838053@linuxfoundation.org> References: <20181002132500.494838053@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold [ Upstream commit 4708aa85d50cc6e962dfa8acf5ad4e0d290a21db ] Make sure to use put_device() to free the initialised struct device so that resources managed by driver core also gets released in the event of a registration failure. Signed-off-by: Johan Hovold Cc: Denis Kirjanov Cc: Mauro Carvalho Chehab Cc: linux-edac Fixes: 2d56b109e3a5 ("EDAC: Handle error path in edac_mc_sysfs_init() properly") Link: http://lkml.kernel.org/r/20180612124335.6420-1-johan@kernel.org Signed-off-by: Borislav Petkov Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/edac/edac_mc_sysfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/edac/edac_mc_sysfs.c +++ b/drivers/edac/edac_mc_sysfs.c @@ -1059,14 +1059,14 @@ int __init edac_mc_sysfs_init(void) err = device_add(mci_pdev); if (err < 0) - goto out_dev_free; + goto out_put_device; edac_dbg(0, "device %s created\n", dev_name(mci_pdev)); return 0; - out_dev_free: - kfree(mci_pdev); + out_put_device: + put_device(mci_pdev); out: return err; }