spi: gpio: prevent memory leak in spi_gpio_probe

[ Upstream commit d3b0ffa1d75d5305ebe34735598993afbb8a869d ]

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. In order to avoid leak spi_contriller_put must
be called 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>
Link: https://lore.kernel.org/r/20190930205241.5483-1-navid.emamdoost@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index 1d3e23e..f9c5bbb 100644 (file)
--- 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);
                return -ENOMEM;
 
        status = devm_add_action_or_reset(&pdev->dev, spi_gpio_put, master);

-       if (status)
+       if (status) {
+               spi_master_put(master);

                return status;
                return status;

+       }

 
        if (of_id)
                status = spi_gpio_probe_dt(pdev, master);
 
        if (of_id)
                status = spi_gpio_probe_dt(pdev, master);