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 8C0DDC6FA8E for ; Sun, 5 Mar 2023 13:55:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229986AbjCENzA (ORCPT ); Sun, 5 Mar 2023 08:55:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229868AbjCENyr (ORCPT ); Sun, 5 Mar 2023 08:54:47 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B166B18A85; Sun, 5 Mar 2023 05:54:24 -0800 (PST) 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 2FCD160B14; Sun, 5 Mar 2023 13:53:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5FA7C433D2; Sun, 5 Mar 2023 13:53:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678024409; bh=SIweHOSwLFh5mHa7adC3YqQ38yalzSuKcdxd8dSPmss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bL7WPh/MnsyYxRiesetUMo9Ee3CL85OKEXKzmKER0nHG0T3Ir4d5RCxXZWBjzLGV2 cFnulD+9KlbGWLocLXdU2EuyEX1ck2kM8z/12FOBWRC26jLddRePf/a6E/9WhKbSFf 1oyhyZGAlexY4m3DbPkaczBCL52YEd4mLUuDONWbul+BrjA0mVluxjOjJ4AUH+OqsH h6f35R8CVANuq2a+aLtOStKuMXeloYhcxRuKl10gukqbgmb/vfqdFXA9zDkCdPN0+E 9sKkeC2RopOwkt0d3Bid0lVdS+t6VbEcuE0+EtCNZ24q7T24z8Wm04ncRgmxb05DJy kFZw2sC701ZuA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Michael Ellerman , Sasha Levin , aik@ozlabs.ru, christophe.leroy@csgroup.eu, linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 6.1 06/15] powerpc/iommu: fix memory leak with using debugfs_lookup() Date: Sun, 5 Mar 2023 08:52:57 -0500 Message-Id: <20230305135306.1793564-6-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230305135306.1793564-1-sashal@kernel.org> References: <20230305135306.1793564-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: Greg Kroah-Hartman [ Upstream commit b505063910c134778202dfad9332dfcecb76bab3 ] When calling debugfs_lookup() the result must have dput() called on it, otherwise the memory will leak over time. To make things simpler, just call debugfs_lookup_and_remove() instead which handles all of the logic at once. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20230202141919.2298821-1-gregkh@linuxfoundation.org Signed-off-by: Sasha Levin --- arch/powerpc/kernel/iommu.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c index caebe1431596e..ee95937bdaf14 100644 --- a/arch/powerpc/kernel/iommu.c +++ b/arch/powerpc/kernel/iommu.c @@ -67,11 +67,9 @@ static void iommu_debugfs_add(struct iommu_table *tbl) static void iommu_debugfs_del(struct iommu_table *tbl) { char name[10]; - struct dentry *liobn_entry; sprintf(name, "%08lx", tbl->it_index); - liobn_entry = debugfs_lookup(name, iommu_debugfs_dir); - debugfs_remove(liobn_entry); + debugfs_lookup_and_remove(name, iommu_debugfs_dir); } #else static void iommu_debugfs_add(struct iommu_table *tbl){} -- 2.39.2