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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 8B132C7618F for ; Mon, 15 Jul 2019 14:56:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C108206B8 for ; Mon, 15 Jul 2019 14:56:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563202581; bh=fQnoVp2Ano+2lN/46uFMtsh5CIXYrF8dnnzvMx4/Kbk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1rb8QGxaPXKmEyontmzNT/VAEO1UNOjqfStbd94lpDmP19nGdRtfz+Nt1OUELCcQH 7YAobMkLNZKX/jg4tIzsXMH5UuHfsLyv2h0lY+fwd7pNJ1cO098WzglhAEGFPpp69O 1TLKUyLsrV6Y5WVJp6NbHwOIj6dJXKQ2nvEbuix8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389200AbfGOOXJ (ORCPT ); Mon, 15 Jul 2019 10:23:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:53180 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390039AbfGOOXH (ORCPT ); Mon, 15 Jul 2019 10:23:07 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 255CA2053B; Mon, 15 Jul 2019 14:23:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563200586; bh=fQnoVp2Ano+2lN/46uFMtsh5CIXYrF8dnnzvMx4/Kbk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MDU+jmlftbz/nEPdhVIOdKYtWHowjFFaPvYvSVez8GSJ6yIUCYF8sYoE9/VhjYMD4 pH9bBauvlNFGnO4S/3VbvA/5Tj/wJnkngWogxGhd8Nm9K3D/zCAwE6Qx9GwXEwIyou 0b4ELlkeseEO1Rk/TD1j3FbYAN9FjeDSvqc7K9s0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pan Bian , Borislav Petkov , Greg Kroah-Hartman , James Morse , Mauro Carvalho Chehab , linux-edac , Sasha Levin Subject: [PATCH AUTOSEL 4.19 084/158] EDAC/sysfs: Fix memory leak when creating a csrow object Date: Mon, 15 Jul 2019 10:16:55 -0400 Message-Id: <20190715141809.8445-84-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715141809.8445-1-sashal@kernel.org> References: <20190715141809.8445-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Pan Bian [ Upstream commit 585fb3d93d32dbe89e718b85009f9c322cc554cd ] In edac_create_csrow_object(), the reference to the object is not released when adding the device to the device hierarchy fails (device_add()). This may result in a memory leak. Signed-off-by: Pan Bian Signed-off-by: Borislav Petkov Reviewed-by: Greg Kroah-Hartman Cc: James Morse Cc: Mauro Carvalho Chehab Cc: linux-edac Link: https://lkml.kernel.org/r/1555554438-103953-1-git-send-email-bianpan2016@163.com Signed-off-by: Sasha Levin --- drivers/edac/edac_mc_sysfs.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c index 20374b8248f0..e50610b5bd06 100644 --- a/drivers/edac/edac_mc_sysfs.c +++ b/drivers/edac/edac_mc_sysfs.c @@ -404,6 +404,8 @@ static inline int nr_pages_per_csrow(struct csrow_info *csrow) static int edac_create_csrow_object(struct mem_ctl_info *mci, struct csrow_info *csrow, int index) { + int err; + csrow->dev.type = &csrow_attr_type; csrow->dev.bus = mci->bus; csrow->dev.groups = csrow_dev_groups; @@ -416,7 +418,11 @@ static int edac_create_csrow_object(struct mem_ctl_info *mci, edac_dbg(0, "creating (virtual) csrow node %s\n", dev_name(&csrow->dev)); - return device_add(&csrow->dev); + err = device_add(&csrow->dev); + if (err) + put_device(&csrow->dev); + + return err; } /* Create a CSROW object under specifed edac_mc_device */ -- 2.20.1