diff options
Diffstat (limited to 'spi-gpio-prevent-memory-leak-in-spi_gpio_probe.patch')
| -rw-r--r-- | spi-gpio-prevent-memory-leak-in-spi_gpio_probe.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/spi-gpio-prevent-memory-leak-in-spi_gpio_probe.patch b/spi-gpio-prevent-memory-leak-in-spi_gpio_probe.patch deleted file mode 100644 index e0a79cfe2..000000000 --- a/spi-gpio-prevent-memory-leak-in-spi_gpio_probe.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d3b0ffa1d75d5305ebe34735598993afbb8a869d Mon Sep 17 00:00:00 2001 -From: Navid Emamdoost <navid.emamdoost@gmail.com> -Date: Mon, 30 Sep 2019 15:52:40 -0500 -Subject: 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> ---- - drivers/spi/spi-gpio.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -(limited to 'drivers/spi/spi-gpio.c') - -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); --- -cgit 1.2-0.3.lf.el7 - |