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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 0ED4AC32750 for ; Fri, 2 Aug 2019 09:41:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D511D2171F for ; Fri, 2 Aug 2019 09:41:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564738917; bh=fGCeSEBzvf1nKJNtELjY/pPwIsiJlgax2LnW3Hs02WY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gIfl3Tm5mcoILSKEWm3jh9UrYY3eUSPCe3Qm09udEYjGoBa7ADLKv2xI2aYOC9W1l 9aMF386tlCDM8PQDV7RUBMg3bO2IdDv0T4BObBX1O/rT5LKrv06v9mfah5H2ing8JF 60QyTog9pZAxF7ZZOYkfKRtthXWeqCyNK28ZB8os= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404938AbfHBJl4 (ORCPT ); Fri, 2 Aug 2019 05:41:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:43826 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404918AbfHBJlx (ORCPT ); Fri, 2 Aug 2019 05:41:53 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 76B782086A; Fri, 2 Aug 2019 09:41:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564738913; bh=fGCeSEBzvf1nKJNtELjY/pPwIsiJlgax2LnW3Hs02WY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GsowGQqOD6sxtFNvsv2l5fQA4dsOy+ZM7QZWqaillBXOEFFtuQ6uAO24vhM50uk71 d+iwZ39a6Wl6Tikj0Z8cwXZ0KqAWJkZF8XptHtw0CILCLHnEI9sKJ1Ef9RZkER4TKF ep6Yb1sCZxE6GfQuxj0Vq/g9Okxipzu24XZih7Bw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pan Bian , Borislav Petkov , James Morse , Mauro Carvalho Chehab , linux-edac , Sasha Levin Subject: [PATCH 4.9 044/223] EDAC/sysfs: Fix memory leak when creating a csrow object Date: Fri, 2 Aug 2019 11:34:29 +0200 Message-Id: <20190802092241.820601377@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802092238.692035242@linuxfoundation.org> References: <20190802092238.692035242@linuxfoundation.org> User-Agent: quilt/0.66 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 [ 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 40d792e96b75..203ebe348b77 100644 --- a/drivers/edac/edac_mc_sysfs.c +++ b/drivers/edac/edac_mc_sysfs.c @@ -426,6 +426,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; @@ -438,7 +440,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