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,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 99B9FC64EB5 for ; Tue, 2 Oct 2018 13:28:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 61A54206B2 for ; Tue, 2 Oct 2018 13:28:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 61A54206B2 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 S1729537AbeJBUMF (ORCPT ); Tue, 2 Oct 2018 16:12:05 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:32836 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726993AbeJBUME (ORCPT ); Tue, 2 Oct 2018 16:12:04 -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 4F0F4A67; Tue, 2 Oct 2018 13:28:42 +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.18 118/228] EDAC: Fix memleak in module init error path Date: Tue, 2 Oct 2018 06:23:35 -0700 Message-Id: <20181002132507.378073872@linuxfoundation.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181002132459.032960735@linuxfoundation.org> References: <20181002132459.032960735@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.18-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 @@ -1075,14 +1075,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; } 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.18,118/228] EDAC: Fix memleak in module init error path From: Greg Kroah-Hartman Message-Id: <20181002132507.378073872@linuxfoundation.org> Date: Tue, 2 Oct 2018 06:23:35 -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: NC4xOC1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBKb2hhbiBIb3Zv bGQgPGpvaGFuQGtlcm5lbC5vcmc+CgpbIFVwc3RyZWFtIGNvbW1pdCA0NzA4YWE4NWQ1MGNjNmU5 NjJkZmE4YWNmNWFkNGUwZDI5MGEyMWRiIF0KCk1ha2Ugc3VyZSB0byB1c2UgcHV0X2RldmljZSgp IHRvIGZyZWUgdGhlIGluaXRpYWxpc2VkIHN0cnVjdCBkZXZpY2Ugc28KdGhhdCByZXNvdXJjZXMg bWFuYWdlZCBieSBkcml2ZXIgY29yZSBhbHNvIGdldHMgcmVsZWFzZWQgaW4gdGhlIGV2ZW50IG9m CmEgcmVnaXN0cmF0aW9uIGZhaWx1cmUuCgpTaWduZWQtb2ZmLWJ5OiBKb2hhbiBIb3ZvbGQgPGpv aGFuQGtlcm5lbC5vcmc+CkNjOiBEZW5pcyBLaXJqYW5vdiA8a2lyamFub3ZAZ21haWwuY29tPgpD YzogTWF1cm8gQ2FydmFsaG8gQ2hlaGFiIDxtY2hlaGFiQGtlcm5lbC5vcmc+CkNjOiBsaW51eC1l ZGFjIDxsaW51eC1lZGFjQHZnZXIua2VybmVsLm9yZz4KRml4ZXM6IDJkNTZiMTA5ZTNhNSAoIkVE QUM6IEhhbmRsZSBlcnJvciBwYXRoIGluIGVkYWNfbWNfc3lzZnNfaW5pdCgpIHByb3Blcmx5IikK TGluazogaHR0cDovL2xrbWwua2VybmVsLm9yZy9yLzIwMTgwNjEyMTI0MzM1LjY0MjAtMS1qb2hh bkBrZXJuZWwub3JnClNpZ25lZC1vZmYtYnk6IEJvcmlzbGF2IFBldGtvdiA8YnBAc3VzZS5kZT4K U2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPGFsZXhhbmRlci5sZXZpbkBtaWNyb3NvZnQuY29t PgpTaWduZWQtb2ZmLWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRp b24ub3JnPgotLS0KIGRyaXZlcnMvZWRhYy9lZGFjX21jX3N5c2ZzLmMgfCAgICA2ICsrKy0tLQog MSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCi0tLSBhL2Ry aXZlcnMvZWRhYy9lZGFjX21jX3N5c2ZzLmMKKysrIGIvZHJpdmVycy9lZGFjL2VkYWNfbWNfc3lz ZnMuYwpAQCAtMTA3NSwxNCArMTA3NSwxNCBAQCBpbnQgX19pbml0IGVkYWNfbWNfc3lzZnNfaW5p dCh2b2lkKQogCiAJZXJyID0gZGV2aWNlX2FkZChtY2lfcGRldik7CiAJaWYgKGVyciA8IDApCi0J CWdvdG8gb3V0X2Rldl9mcmVlOworCQlnb3RvIG91dF9wdXRfZGV2aWNlOwogCiAJZWRhY19kYmco MCwgImRldmljZSAlcyBjcmVhdGVkXG4iLCBkZXZfbmFtZShtY2lfcGRldikpOwogCiAJcmV0dXJu IDA7CiAKLSBvdXRfZGV2X2ZyZWU6Ci0Ja2ZyZWUobWNpX3BkZXYpOworIG91dF9wdXRfZGV2aWNl OgorCXB1dF9kZXZpY2UobWNpX3BkZXYpOwogIG91dDoKIAlyZXR1cm4gZXJyOwogfQo=