]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
misc: rtsx: Fix memory leak in rtsx_pci_probe
authorKeita Suzuki <keitasuzuki.park@sslab.ics.keio.ac.jp>
Wed, 9 Sep 2020 07:18:51 +0000 (07:18 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Oct 2020 09:08:24 +0000 (10:08 +0100)
[ Upstream commit bc28369c6189009b66d9619dd9f09bd8c684bb98 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/misc/cardreader/rtsx_pcr.c

index 0d5928bc1b6d7789361996eb7e416eb505520dfe..82246f7aec6fb8ccae6045e6430aaae4e8012704 100644 (file)
@@ -1536,12 +1536,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: