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: [AUTOSEL,4.14,82/87] EDAC: Fix memleak in module init error path From: Sasha Levin Message-Id: <20180917030220.245686-82-alexander.levin@microsoft.com> Date: Mon, 17 Sep 2018 03:03:17 +0000 To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" Cc: Johan Hovold , Denis Kirjanov , Mauro Carvalho Chehab , linux-edac , Borislav Petkov , Sasha Levin List-ID: RnJvbTogSm9oYW4gSG92b2xkIDxqb2hhbkBrZXJuZWwub3JnPgoKWyBVcHN0cmVhbSBjb21taXQg NDcwOGFhODVkNTBjYzZlOTYyZGZhOGFjZjVhZDRlMGQyOTBhMjFkYiBdCgpNYWtlIHN1cmUgdG8g dXNlIHB1dF9kZXZpY2UoKSB0byBmcmVlIHRoZSBpbml0aWFsaXNlZCBzdHJ1Y3QgZGV2aWNlIHNv CnRoYXQgcmVzb3VyY2VzIG1hbmFnZWQgYnkgZHJpdmVyIGNvcmUgYWxzbyBnZXRzIHJlbGVhc2Vk IGluIHRoZSBldmVudCBvZgphIHJlZ2lzdHJhdGlvbiBmYWlsdXJlLgoKU2lnbmVkLW9mZi1ieTog Sm9oYW4gSG92b2xkIDxqb2hhbkBrZXJuZWwub3JnPgpDYzogRGVuaXMgS2lyamFub3YgPGtpcmph bm92QGdtYWlsLmNvbT4KQ2M6IE1hdXJvIENhcnZhbGhvIENoZWhhYiA8bWNoZWhhYkBrZXJuZWwu b3JnPgpDYzogbGludXgtZWRhYyA8bGludXgtZWRhY0B2Z2VyLmtlcm5lbC5vcmc+CkZpeGVzOiAy ZDU2YjEwOWUzYTUgKCJFREFDOiBIYW5kbGUgZXJyb3IgcGF0aCBpbiBlZGFjX21jX3N5c2ZzX2lu aXQoKSBwcm9wZXJseSIpCkxpbms6IGh0dHA6Ly9sa21sLmtlcm5lbC5vcmcvci8yMDE4MDYxMjEy NDMzNS42NDIwLTEtam9oYW5Aa2VybmVsLm9yZwpTaWduZWQtb2ZmLWJ5OiBCb3Jpc2xhdiBQZXRr b3YgPGJwQHN1c2UuZGU+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxhbGV4YW5kZXIubGV2 aW5AbWljcm9zb2Z0LmNvbT4KLS0tCiBkcml2ZXJzL2VkYWMvZWRhY19tY19zeXNmcy5jIHwgNiAr KystLS0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9lZGFjL2VkYWNfbWNfc3lzZnMuYyBiL2RyaXZlcnMvZWRhYy9l ZGFjX21jX3N5c2ZzLmMKaW5kZXggZTRmY2ZhODRmYmQzLi43OWMxMzMwMWJmNDEgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZWRhYy9lZGFjX21jX3N5c2ZzLmMKKysrIGIvZHJpdmVycy9lZGFjL2VkYWNf bWNfc3lzZnMuYwpAQCAtMTA5NywxNCArMTA5NywxNCBAQCBpbnQgX19pbml0IGVkYWNfbWNfc3lz ZnNfaW5pdCh2b2lkKQogCiAJZXJyID0gZGV2aWNlX2FkZChtY2lfcGRldik7CiAJaWYgKGVyciA8 IDApCi0JCWdvdG8gb3V0X2Rldl9mcmVlOworCQlnb3RvIG91dF9wdXRfZGV2aWNlOwogCiAJZWRh Y19kYmcoMCwgImRldmljZSAlcyBjcmVhdGVkXG4iLCBkZXZfbmFtZShtY2lfcGRldikpOwogCiAJ cmV0dXJuIDA7CiAKLSBvdXRfZGV2X2ZyZWU6Ci0Ja2ZyZWUobWNpX3BkZXYpOworIG91dF9wdXRf ZGV2aWNlOgorCXB1dF9kZXZpY2UobWNpX3BkZXYpOwogIG91dDoKIAlyZXR1cm4gZXJyOwogfQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-eopbgr690116.outbound.protection.outlook.com ([40.107.69.116]:54124 "EHLO NAM04-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730532AbeIQIa3 (ORCPT ); Mon, 17 Sep 2018 04:30:29 -0400 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Johan Hovold , Denis Kirjanov , Mauro Carvalho Chehab , linux-edac , Borislav Petkov , Sasha Levin Subject: [PATCH AUTOSEL 4.14 82/87] EDAC: Fix memleak in module init error path Date: Mon, 17 Sep 2018 03:03:17 +0000 Message-ID: <20180917030220.245686-82-alexander.levin@microsoft.com> References: <20180917030220.245686-1-alexander.levin@microsoft.com> In-Reply-To: <20180917030220.245686-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: 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() prope= rly") Link: http://lkml.kernel.org/r/20180612124335.6420-1-johan@kernel.org Signed-off-by: Borislav Petkov Signed-off-by: Sasha Levin --- drivers/edac/edac_mc_sysfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c index e4fcfa84fbd3..79c13301bf41 100644 --- a/drivers/edac/edac_mc_sysfs.c +++ b/drivers/edac/edac_mc_sysfs.c @@ -1097,14 +1097,14 @@ int __init edac_mc_sysfs_init(void) =20 err =3D device_add(mci_pdev); if (err < 0) - goto out_dev_free; + goto out_put_device; =20 edac_dbg(0, "device %s created\n", dev_name(mci_pdev)); =20 return 0; =20 - out_dev_free: - kfree(mci_pdev); + out_put_device: + put_device(mci_pdev); out: return err; } --=20 2.17.1