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=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 12F32C433E1 for ; Thu, 18 Jun 2020 02:13:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D9F3020853 for ; Thu, 18 Jun 2020 02:13:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592446430; bh=Z41N+cIfPZq6+16FIiby5DDwyV51obckIwKxYJuq+4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vHLk3H0EDfBiTx6btBz6ky2JLuC+2ETg7h54lUz8ZiP67uz0AW8PEyhhW6k81jQjj 7qPkepwkEhdjUg2AnPxldy99qt1iKe0qwHVOSGa2RQxlEb6TV4ujb15BUIar10cn5R p3p3NcTMp1NsrjsSIpz86Q9vFAPVYuwiwTn3BQhE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730969AbgFRCNt (ORCPT ); Wed, 17 Jun 2020 22:13:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:53284 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730421AbgFRBU5 (ORCPT ); Wed, 17 Jun 2020 21:20:57 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.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 C27E421927; Thu, 18 Jun 2020 01:20:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443257; bh=Z41N+cIfPZq6+16FIiby5DDwyV51obckIwKxYJuq+4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0MpO/2vFNxXlDDrqgE81vbNOiazHkoJGq9GrUMlI1CPn8uEwA38QVmI6QOC8gcZoY shaLueZyqtxUg++1npy3vuVMuQIfeiyBf4BWK5oSfCyJm1JLNGT0OW2t4csrFh9Fhv jq5/2aYGJ7lp4+lZQJudrYUyLVH0Da8f5oPTOoMU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Rob Herring , Sasha Levin , devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 205/266] of: Fix a refcounting bug in __of_attach_node_sysfs() Date: Wed, 17 Jun 2020 21:15:30 -0400 Message-Id: <20200618011631.604574-205-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618011631.604574-1-sashal@kernel.org> References: <20200618011631.604574-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: Dan Carpenter [ Upstream commit 8a325dd06f2358ea0888e4ff1c9ca4bc23bd53f3 ] The problem in this code is that if kobject_add() fails, then it should call of_node_put(np) to drop the reference count. I've actually moved the of_node_get(np) later in the function to avoid needing to do clean up. Fixes: 5b2c2f5a0ea3 ("of: overlay: add missing of_node_get() in __of_attach_node_sysfs") Signed-off-by: Dan Carpenter Signed-off-by: Rob Herring Signed-off-by: Sasha Levin --- drivers/of/kobj.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/of/kobj.c b/drivers/of/kobj.c index c72eef988041..a32e60b024b8 100644 --- a/drivers/of/kobj.c +++ b/drivers/of/kobj.c @@ -134,8 +134,6 @@ int __of_attach_node_sysfs(struct device_node *np) if (!name) return -ENOMEM; - of_node_get(np); - rc = kobject_add(&np->kobj, parent, "%s", name); kfree(name); if (rc) @@ -144,6 +142,7 @@ int __of_attach_node_sysfs(struct device_node *np) for_each_property_of_node(np, pp) __of_add_property_sysfs(np, pp); + of_node_get(np); return 0; } -- 2.25.1