lkml.org 
[lkml]   [2019]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] spi: gpio: prevent memroy leak in spi_gpio_probe
    Date
    In spi_gpio_probe an SPI master is allocated via spi_alloc_master, but
    this controller should be released if devm_add_action_or_reset fails,
    otherwise memory leaks. This commit adds Fixes: spi_contriller_put in
    case of failure for devm_add_action_or_reset.

    Fixes: 8b797490b4db ("spi: gpio: Make sure spi_master_put() is called in every error path")
    Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
    ---
    drivers/spi/spi-gpio.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
    index 1d3e23ec20a6..f9c5bbb74714 100644
    --- a/drivers/spi/spi-gpio.c
    +++ b/drivers/spi/spi-gpio.c
    @@ -371,8 +371,10 @@ static int spi_gpio_probe(struct platform_device *pdev)
    return -ENOMEM;

    status = devm_add_action_or_reset(&pdev->dev, spi_gpio_put, master);
    - if (status)
    + if (status) {
    + spi_master_put(master);
    return status;
    + }

    if (of_id)
    status = spi_gpio_probe_dt(pdev, master);
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-09-30 05:40    [W:2.699 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site