diff options
author | Keita Suzuki <keitasuzuki.park@sslab.ics.keio.ac.jp> | 2020-09-09 07:18:51 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-16 17:30:37 +0200 |
commit | bc28369c6189009b66d9619dd9f09bd8c684bb98 (patch) | |
tree | 98d4e657121565d045d17ca6629d8f66269d9665 | |
parent | 7369fa47c442a6d4268989b64fbc28af48f9126e (diff) | |
download | linux-bc28369c6189009b66d9619dd9f09bd8c684bb98.tar.bz2 |
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>
-rw-r--r-- | drivers/misc/cardreader/rtsx_pcr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c index 3a4a7b0cc098..c089eae71ccc 100644 --- a/drivers/misc/cardreader/rtsx_pcr.c +++ b/drivers/misc/cardreader/rtsx_pcr.c @@ -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: |