lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 367/408] misc: rtsx: Fix memory leak in rtsx_pci_probe
    Date
    From: Keita Suzuki <keitasuzuki.park@sslab.ics.keio.ac.jp>

    [ 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 | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c
    index 1958833b3b74e..4fd57052ddd3d 100644
    --- a/drivers/misc/cardreader/rtsx_pcr.c
    +++ b/drivers/misc/cardreader/rtsx_pcr.c
    @@ -1534,12 +1534,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:
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 16:10    [W:4.150 / U:0.212 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site