misc: rtsx: Fix memory leak in rtsx_pci_probe

[ 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>

diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c
index 5c5d0241603a371770208c3f5b46594931b0b71e..3eb3c237f3398398d1bc6e6e0ce96fc05606b524 100644 (file)
--- a/drivers/misc/cardreader/rtsx_pcr.c
+++ b/drivers/misc/cardreader/rtsx_pcr.c
@@ -1524,12 +1524,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: