openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

spi: gpio: Make sure spi_master_put() is called in every error path 

There's a number of failure paths in spi_gpio_probe() that do not call
spi_master_put() potentially leaking memory. Fix this problem by
registering a cleanup funciont via devm_add_action_or_reset() right
after SPI controller is allocated.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Chris Healy <cphealy@gmail.com>
Cc: linux-spi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andrey Smirnov 2019-04-02 21:01:31 -07:00 committed by Mark Brown
parent 8b57b11bc4
commit 8b797490b4
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/spi/spi-gpio.c
View File

@ -362,6 +362,11 @@ static int spi_gpio_probe_pdata(struct platform_device *pdev,
return 0; return 0;
} }
static void spi_gpio_put(void *data)
{
spi_master_put(data);
}
static int spi_gpio_probe(struct platform_device *pdev) static int spi_gpio_probe(struct platform_device *pdev)
{ {
int status; int status;
@ -377,6 +382,10 @@ static int spi_gpio_probe(struct platform_device *pdev)
if (!master) if (!master)
return -ENOMEM; return -ENOMEM;
status = devm_add_action_or_reset(&pdev->dev, spi_gpio_put, master);
if (status)
return status;
if (of_id) if (of_id)
status = spi_gpio_probe_dt(pdev, master); status = spi_gpio_probe_dt(pdev, master);
else else
@ -428,11 +437,7 @@ static int spi_gpio_probe(struct platform_device *pdev)
} }
bb->setup_transfer = spi_bitbang_setup_transfer; bb->setup_transfer = spi_bitbang_setup_transfer;
status = spi_bitbang_start(&spi_gpio->bitbang); return spi_bitbang_start(&spi_gpio->bitbang);
if (status)
spi_master_put(master);
return status;
} }
static int spi_gpio_remove(struct platform_device *pdev) static int spi_gpio_remove(struct platform_device *pdev)
@ -444,8 +449,6 @@ static int spi_gpio_remove(struct platform_device *pdev)
/* stop() unregisters child devices too */ /* stop() unregisters child devices too */
spi_bitbang_stop(&spi_gpio->bitbang); spi_bitbang_stop(&spi_gpio->bitbang);
spi_master_put(spi_gpio->bitbang.master);
return 0; return 0;
} }