diff options
author | Navid Emamdoost <navid.emamdoost@gmail.com> | 2019-09-30 15:52:40 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-10-01 18:38:52 +0100 |
commit | d3b0ffa1d75d5305ebe34735598993afbb8a869d (patch) | |
tree | 991c195aa1b2dfa984f0fde403590a6c5aa239fe /drivers/spi/spi-gpio.c | |
parent | 6b04e47b73f2a0d2c330cecca99f8e2cb8f85b34 (diff) | |
download | linux-stable-d3b0ffa1d75d5305ebe34735598993afbb8a869d.tar.gz linux-stable-d3b0ffa1d75d5305ebe34735598993afbb8a869d.tar.bz2 linux-stable-d3b0ffa1d75d5305ebe34735598993afbb8a869d.zip |
spi: gpio: prevent memory leak in spi_gpio_probe
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>
Diffstat (limited to 'drivers/spi/spi-gpio.c')
-rw-r--r-- | drivers/spi/spi-gpio.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); |