Commit bc28369c authored Sep 09, 2020 by Keita Suzuki Committed by Greg Kroah-Hartman Sep 16, 2020

misc: rtsx: Fix memory leak in rtsx_pci_probe



When mfd_add_devices() fail, pcr->slots should also be freed. However,
the current implementation does not free the member, leading to a memory
leak.

Fix this by adding a new goto label that frees pcr->slots.

Signed-off-by: Keita Suzuki <keitasuzuki.park@sslab.ics.keio.ac.jp>
Link: https://lore.kernel.org/r/20200909071853.4053-1-keitasuzuki.park@sslab.ics.keio.ac.jp


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 7369fa47

drivers/misc/cardreader/rtsx_pcr.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1558,12 +1558,14 @@ static int rtsx_pci_probe(struct pci_dev *pcidev,
		ret = mfd_add_devices(&pcidev->dev, pcr->id, rtsx_pcr_cells,
		ARRAY_SIZE(rtsx_pcr_cells), NULL, 0, NULL);
		if (ret < 0)
		goto disable_irq;
		goto free_slots;

		schedule_delayed_work(&pcr->idle_work, msecs_to_jiffies(200));

		return 0;

		free_slots:
		kfree(pcr->slots);
		disable_irq:
		free_irq(pcr->irq, (void *)pcr);
		disable_msi:

Admin message