public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	"Paulo Miguel Almeida" <paulo.miguel.almeida.rodenas@gmail.com>,
	"Dan Carpenter" <error27@gmail.com>,
	"Sidong Yang" <realwakka@gmail.com>,
	"Liu Shixin" <liushixin2@huawei.com>,
	"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
	"Sasha Levin" <sashal@kernel.org>,
	linux-staging@lists.linux.dev
Subject: [PATCH AUTOSEL 6.1 25/60] staging: pi433: fix memory leak with using debugfs_lookup()
Date: Fri,  3 Mar 2023 16:42:39 -0500	[thread overview]
Message-ID: <20230303214315.1447666-25-sashal@kernel.org> (raw)
In-Reply-To: <20230303214315.1447666-1-sashal@kernel.org>

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

[ Upstream commit 2f36e789e540df6a9fbf471b3a2ba62a8b361586 ]

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.  This requires saving off the root directory dentry to make
creation of individual device subdirectories easier.

Cc: Paulo Miguel Almeida <paulo.miguel.almeida.rodenas@gmail.com>
Cc: Dan Carpenter <error27@gmail.com>
Cc: Sidong Yang <realwakka@gmail.com>
Cc: Liu Shixin <liushixin2@huawei.com>
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230202141138.2291946-1-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/staging/pi433/pi433_if.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index d4e06a3929f3d..b59f6a4cb611a 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -55,6 +55,7 @@
 static dev_t pi433_dev;
 static DEFINE_IDR(pi433_idr);
 static DEFINE_MUTEX(minor_lock); /* Protect idr accesses */
+static struct dentry *root_dir;	/* debugfs root directory for the driver */
 
 static struct class *pi433_class; /* mainly for udev to create /dev/pi433 */
 
@@ -1306,8 +1307,7 @@ static int pi433_probe(struct spi_device *spi)
 	/* spi setup */
 	spi_set_drvdata(spi, device);
 
-	entry = debugfs_create_dir(dev_name(device->dev),
-				   debugfs_lookup(KBUILD_MODNAME, NULL));
+	entry = debugfs_create_dir(dev_name(device->dev), root_dir);
 	debugfs_create_file("regs", 0400, entry, device, &pi433_debugfs_regs_fops);
 
 	return 0;
@@ -1333,9 +1333,8 @@ static int pi433_probe(struct spi_device *spi)
 static void pi433_remove(struct spi_device *spi)
 {
 	struct pi433_device	*device = spi_get_drvdata(spi);
-	struct dentry *mod_entry = debugfs_lookup(KBUILD_MODNAME, NULL);
 
-	debugfs_remove(debugfs_lookup(dev_name(device->dev), mod_entry));
+	debugfs_lookup_and_remove(dev_name(device->dev), root_dir);
 
 	/* free GPIOs */
 	free_gpio(device);
@@ -1408,7 +1407,7 @@ static int __init pi433_init(void)
 		return PTR_ERR(pi433_class);
 	}
 
-	debugfs_create_dir(KBUILD_MODNAME, NULL);
+	root_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
 
 	status = spi_register_driver(&pi433_spi_driver);
 	if (status < 0) {
@@ -1427,7 +1426,7 @@ static void __exit pi433_exit(void)
 	spi_unregister_driver(&pi433_spi_driver);
 	class_destroy(pi433_class);
 	unregister_chrdev(MAJOR(pi433_dev), pi433_spi_driver.driver.name);
-	debugfs_remove_recursive(debugfs_lookup(KBUILD_MODNAME, NULL));
+	debugfs_remove(root_dir);
 }
 module_exit(pi433_exit);
 
-- 
2.39.2


  parent reply	other threads:[~2023-03-03 21:46 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-03 21:42 [PATCH AUTOSEL 6.1 01/60] IB/hfi1: Update RMT size calculation Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 02/60] iommu/amd: Fix error handling for pdev_pri_ats_enable() Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 03/60] PCI/ACPI: Account for _S0W of the target bridge in acpi_pci_bridge_d3() Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 04/60] media: uvcvideo: Remove format descriptions Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 05/60] media: uvcvideo: Handle cameras with invalid descriptors Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 06/60] media: uvcvideo: Handle errors from calls to usb_string Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 07/60] media: uvcvideo: Quirk for autosuspend in Logitech B910 and C910 Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 08/60] media: uvcvideo: Silence memcpy() run-time false positive warnings Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 09/60] USB: fix memory leak with using debugfs_lookup() Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 10/60] cacheinfo: Fix shared_cpu_map to handle shared caches at different levels Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 11/60] staging: emxx_udc: Add checks for dma_alloc_coherent() Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 12/60] tty: fix out-of-bounds access in tty_driver_lookup_tty() Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 13/60] tty: serial: fsl_lpuart: disable the CTS when send break signal Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 14/60] serial: sc16is7xx: setup GPIO controller later in probe Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 15/60] mei: bus-fixup:upon error print return values of send and receive Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 16/60] parport_pc: Set up mode and ECR masks for Oxford Semiconductor devices Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 17/60] tools/iio/iio_utils:fix memory leak Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 18/60] bus: mhi: ep: Fix the debug message for MHI_PKT_TYPE_RESET_CHAN_CMD cmd Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 19/60] iio: accel: mma9551_core: Prevent uninitialized variable in mma9551_read_status_word() Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 20/60] iio: accel: mma9551_core: Prevent uninitialized variable in mma9551_read_config_word() Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 21/60] media: uvcvideo: Add GUID for BGRA/X 8:8:8:8 Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 22/60] firmware: coreboot: framebuffer: Ignore reserved pixel color bits Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 23/60] soundwire: bus_type: Avoid lockdep assert in sdw_drv_probe() Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 24/60] PCI: loongson: Prevent LS7A MRRS increases Sasha Levin
2023-03-03 21:42 ` Sasha Levin [this message]
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 26/60] USB: dwc3: fix memory leak with using debugfs_lookup() Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 27/60] USB: chipidea: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 28/60] USB: ULPI: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 29/60] USB: uhci: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 30/60] USB: sl811: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 31/60] USB: fotg210: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 32/60] USB: isp116x: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 33/60] USB: isp1362: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 34/60] USB: gadget: gr_udc: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 35/60] USB: gadget: bcm63xx_udc: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 36/60] USB: gadget: lpc32xx_udc: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 37/60] USB: gadget: pxa25x_udc: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 38/60] USB: gadget: pxa27x_udc: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 39/60] usb: host: xhci: mvebu: Iterate over array indexes instead of using pointer math Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 40/60] USB: ene_usb6250: Allocate enough memory for full object Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 41/60] usb: uvc: Enumerate valid values for color matching Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 42/60] usb: gadget: uvc: Make bSourceID read/write Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 43/60] PCI: Align extra resources for hotplug bridges properly Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 44/60] PCI: Take other bus devices into account when distributing resources Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 45/60] PCI: Distribute available resources for root buses, too Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 46/60] tty: pcn_uart: fix memory leak with using debugfs_lookup() Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 47/60] misc: vmw_balloon: " Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 48/60] drivers: base: component: " Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 49/60] drivers: base: dd: " Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 50/60] kernel/time/test_udelay.c: " Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 51/60] kernel/power/energy_model.c: " Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 52/60] kernel/fail_function: " Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 53/60] PCI: loongson: Add more devices that need MRRS quirk Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 54/60] PCI: Add ACS quirk for Wangxun NICs Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 55/60] PCI: pciehp: Add Qualcomm quirk for Command Completed erratum Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 56/60] phy: rockchip-typec: Fix unsigned comparison with less than zero Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 57/60] RDMA/cma: Distinguish between sockaddr_in and sockaddr_in6 by size Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 58/60] iommu: Attach device group to old domain in error path Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 59/60] soundwire: cadence: Remove wasted space in response_buf Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 60/60] soundwire: cadence: Drain the RX FIFO after an IO timeout Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230303214315.1447666-25-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=error27@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=liushixin2@huawei.com \
    --cc=paulo.miguel.almeida.rodenas@gmail.com \
    --cc=realwakka@gmail.com \
    --cc=stable@vger.kernel.org \
    --cc=u.kleine-koenig@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox