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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D89C2C433F5 for ; Fri, 1 Apr 2022 14:38:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344610AbiDAOkK (ORCPT ); Fri, 1 Apr 2022 10:40:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348303AbiDAOdy (ORCPT ); Fri, 1 Apr 2022 10:33:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72380A1AE; Fri, 1 Apr 2022 07:31:56 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0D4A861CCD; Fri, 1 Apr 2022 14:31:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A23A0C2BBE4; Fri, 1 Apr 2022 14:31:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648823515; bh=1JoZfE6UdxHEB+nH3V/p32G6m+oS2lKo835qRMi3X5E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ov+CoZ9NkscfQ6TICTAJcEaP7xFdGy0XF/mRBlEmymbRPGdk3OPlQkj9YDAvOmFxc gCCtSyracMn6QgfGd/D7Eu+4KpZPqvliCb/TKHSkUysN/INYVcFr/LPqK1/bnOKxIs xFhXVDhI8ch/SwyhmuJqMs9FABdh2bSVsHVtJhp13zQ9xc2Vl1km2GKm12Pp4wJXdk o9b9O+EPFKnY6Z/LM36drJICEPeO1JtZRLC05YhPEPHwZOLVumjzB1fRP07D+51fjh Jhnq7OG1eu4nCXIQ1oZRY0heFjak4v6MZQvQTWTtxFECRyOwH0p/K+9YwFg2CN2AqL crTs9KQxDCbjw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hangyu Hua , Michael Ellerman , Sasha Levin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 5.17 124/149] powerpc/secvar: fix refcount leak in format_show() Date: Fri, 1 Apr 2022 10:25:11 -0400 Message-Id: <20220401142536.1948161-124-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220401142536.1948161-1-sashal@kernel.org> References: <20220401142536.1948161-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hangyu Hua [ Upstream commit d601fd24e6964967f115f036a840f4f28488f63f ] Refcount leak will happen when format_show returns failure in multiple cases. Unified management of of_node_put can fix this problem. Signed-off-by: Hangyu Hua Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20220302021959.10959-1-hbh25y@gmail.com Signed-off-by: Sasha Levin --- arch/powerpc/kernel/secvar-sysfs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kernel/secvar-sysfs.c b/arch/powerpc/kernel/secvar-sysfs.c index a0a78aba2083..1ee4640a2641 100644 --- a/arch/powerpc/kernel/secvar-sysfs.c +++ b/arch/powerpc/kernel/secvar-sysfs.c @@ -26,15 +26,18 @@ static ssize_t format_show(struct kobject *kobj, struct kobj_attribute *attr, const char *format; node = of_find_compatible_node(NULL, NULL, "ibm,secvar-backend"); - if (!of_device_is_available(node)) - return -ENODEV; + if (!of_device_is_available(node)) { + rc = -ENODEV; + goto out; + } rc = of_property_read_string(node, "format", &format); if (rc) - return rc; + goto out; rc = sprintf(buf, "%s\n", format); +out: of_node_put(node); return rc; -- 2.34.1