* [PATCH] mfd: 88pm800: Fix I2C device resource leak if probe fails
@ 2014-02-12 9:51 Krzysztof Kozlowski
2014-02-12 9:58 ` Lee Jones
0 siblings, 1 reply; 4+ messages in thread
From: Krzysztof Kozlowski @ 2014-02-12 9:51 UTC (permalink / raw)
To: Samuel Ortiz, Lee Jones, linux-kernel; +Cc: Krzysztof Kozlowski, stable
During probe the driver allocates two dummy I2C devices for subchips in
function pm800_pages_init(). Additionally this function allocates
regmaps for these subchips. If any of these steps fail then these dummy
I2C devices are not freed and resources leak.
On pm800_pages_init() fail the driver must call pm800_pages_exit() to
unregister dummy I2C devices.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: stable@vger.kernel.org
---
drivers/mfd/88pm800.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c
index 7dca1e640970..28627c1ff9da 100644
--- a/drivers/mfd/88pm800.c
+++ b/drivers/mfd/88pm800.c
@@ -586,8 +586,8 @@ static int pm800_probe(struct i2c_client *client,
return 0;
err_device_init:
- pm800_pages_exit(chip);
err_page_init:
+ pm800_pages_exit(chip);
err_subchip_alloc:
pm80x_deinit();
out_init:
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] mfd: 88pm800: Fix I2C device resource leak if probe fails
2014-02-12 9:51 [PATCH] mfd: 88pm800: Fix I2C device resource leak if probe fails Krzysztof Kozlowski
@ 2014-02-12 9:58 ` Lee Jones
2014-02-12 10:10 ` [PATCH v2] " Krzysztof Kozlowski
0 siblings, 1 reply; 4+ messages in thread
From: Lee Jones @ 2014-02-12 9:58 UTC (permalink / raw)
To: Krzysztof Kozlowski; +Cc: Samuel Ortiz, linux-kernel, stable
> During probe the driver allocates two dummy I2C devices for subchips in
> function pm800_pages_init(). Additionally this function allocates
> regmaps for these subchips. If any of these steps fail then these dummy
> I2C devices are not freed and resources leak.
>
> On pm800_pages_init() fail the driver must call pm800_pages_exit() to
> unregister dummy I2C devices.
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> Cc: stable@vger.kernel.org
> ---
> drivers/mfd/88pm800.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c
> index 7dca1e640970..28627c1ff9da 100644
> --- a/drivers/mfd/88pm800.c
> +++ b/drivers/mfd/88pm800.c
> @@ -586,8 +586,8 @@ static int pm800_probe(struct i2c_client *client,
> return 0;
>
> err_device_init:
> - pm800_pages_exit(chip);
> err_page_init:
> + pm800_pages_exit(chip);
> err_subchip_alloc:
> pm80x_deinit();
> out_init:
If you're going to do this, then can you clean-up the superfluous
goto labels please?
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] mfd: 88pm800: Fix I2C device resource leak if probe fails
2014-02-12 9:58 ` Lee Jones
@ 2014-02-12 10:10 ` Krzysztof Kozlowski
2014-02-12 10:16 ` Lee Jones
0 siblings, 1 reply; 4+ messages in thread
From: Krzysztof Kozlowski @ 2014-02-12 10:10 UTC (permalink / raw)
To: Samuel Ortiz, Lee Jones, linux-kernel; +Cc: Krzysztof Kozlowski, stable
During probe the driver allocates two dummy I2C devices for subchips in
function pm800_pages_init(). Additionally this function allocates
regmaps for these subchips. If any of these steps fail then these dummy
I2C devices are not freed and resources leak.
On pm800_pages_init() fail the driver must call pm800_pages_exit() to
unregister dummy I2C devices.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: stable@vger.kernel.org
---
drivers/mfd/88pm800.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c
index 7dca1e640970..841717a2842c 100644
--- a/drivers/mfd/88pm800.c
+++ b/drivers/mfd/88pm800.c
@@ -571,7 +571,7 @@ static int pm800_probe(struct i2c_client *client,
ret = pm800_pages_init(chip);
if (ret) {
dev_err(&client->dev, "pm800_pages_init failed!\n");
- goto err_page_init;
+ goto err_device_init;
}
ret = device_800_init(chip, pdata);
@@ -587,7 +587,6 @@ static int pm800_probe(struct i2c_client *client,
err_device_init:
pm800_pages_exit(chip);
-err_page_init:
err_subchip_alloc:
pm80x_deinit();
out_init:
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] mfd: 88pm800: Fix I2C device resource leak if probe fails
2014-02-12 10:10 ` [PATCH v2] " Krzysztof Kozlowski
@ 2014-02-12 10:16 ` Lee Jones
0 siblings, 0 replies; 4+ messages in thread
From: Lee Jones @ 2014-02-12 10:16 UTC (permalink / raw)
To: Krzysztof Kozlowski; +Cc: Samuel Ortiz, linux-kernel, stable
On Wed, 12 Feb 2014, Krzysztof Kozlowski wrote:
> During probe the driver allocates two dummy I2C devices for subchips in
> function pm800_pages_init(). Additionally this function allocates
> regmaps for these subchips. If any of these steps fail then these dummy
> I2C devices are not freed and resources leak.
>
> On pm800_pages_init() fail the driver must call pm800_pages_exit() to
> unregister dummy I2C devices.
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> Cc: stable@vger.kernel.org
> ---
> drivers/mfd/88pm800.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
Applied, thanks.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-02-12 10:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-12 9:51 [PATCH] mfd: 88pm800: Fix I2C device resource leak if probe fails Krzysztof Kozlowski
2014-02-12 9:58 ` Lee Jones
2014-02-12 10:10 ` [PATCH v2] " Krzysztof Kozlowski
2014-02-12 10:16 ` Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox