[PATCH] media: venus: core: Fix a resource leak in the error handling path of 'venus_probe()'

Subsystems: arm/qualcomm mailing list, media input infrastructure (v4l/dvb), qualcomm venus video accelerator driver, the rest

STALE1735d

2 messages, 1 author, 2021-11-11 · open the first message on its own page

[PATCH] media: venus: core: Fix a resource leak in the error handling path of 'venus_probe()'

From: Christophe JAILLET <hidden>
Date: 2021-08-19 20:05:42

A successful 'of_platform_populate()' call should be balanced by a
corresponding 'of_platform_depopulate()' call in the error handling path
of the probe, as already done in the remove function.

A successful 'venus_firmware_init()' call should be balanced by a
corresponding 'venus_firmware_deinit()' call in the error handling path
of the probe, as already done in the remove function.

Update the error handling path accordingly.

Fixes: f9799fcce4bb ("media: venus: firmware: register separate platform_device for firmware loader")
Signed-off-by: Christophe JAILLET <redacted>
---
 drivers/media/platform/qcom/venus/core.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 91b15842c555..9cb0ab7d1677 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -349,11 +349,11 @@ static int venus_probe(struct platform_device *pdev)
 
 	ret = venus_firmware_init(core);
 	if (ret)
-		goto err_runtime_disable;
+		goto err_of_depopulate;
 
 	ret = venus_boot(core);
 	if (ret)
-		goto err_runtime_disable;
+		goto err_firmware_deinit;
 
 	ret = hfi_core_resume(core, true);
 	if (ret)
@@ -385,6 +385,10 @@ static int venus_probe(struct platform_device *pdev)
 	v4l2_device_unregister(&core->v4l2_dev);
 err_venus_shutdown:
 	venus_shutdown(core);
+err_firmware_deinit:
+	venus_firmware_deinit(core);
+err_of_depopulate:
+	of_platform_depopulate(dev);
 err_runtime_disable:
 	pm_runtime_put_noidle(dev);
 	pm_runtime_set_suspended(dev);
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] media: venus: core: Fix a resource leak in the error handling path of 'venus_probe()'

From: Christophe JAILLET <hidden>
Date: 2021-11-11 15:17:23

Le 19/08/2021 à 22:05, Christophe JAILLET a écrit :
quoted hunk
A successful 'of_platform_populate()' call should be balanced by a
corresponding 'of_platform_depopulate()' call in the error handling path
of the probe, as already done in the remove function.

A successful 'venus_firmware_init()' call should be balanced by a
corresponding 'venus_firmware_deinit()' call in the error handling path
of the probe, as already done in the remove function.

Update the error handling path accordingly.

Fixes: f9799fcce4bb ("media: venus: firmware: register separate platform_device for firmware loader")
Signed-off-by: Christophe JAILLET <redacted>
---
  drivers/media/platform/qcom/venus/core.c | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 91b15842c555..9cb0ab7d1677 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -349,11 +349,11 @@ static int venus_probe(struct platform_device *pdev)
  
  	ret = venus_firmware_init(core);
  	if (ret)
-		goto err_runtime_disable;
+		goto err_of_depopulate;
  
  	ret = venus_boot(core);
  	if (ret)
-		goto err_runtime_disable;
+		goto err_firmware_deinit;
  
  	ret = hfi_core_resume(core, true);
  	if (ret)
@@ -385,6 +385,10 @@ static int venus_probe(struct platform_device *pdev)
  	v4l2_device_unregister(&core->v4l2_dev);
  err_venus_shutdown:
  	venus_shutdown(core);
+err_firmware_deinit:
+	venus_firmware_deinit(core);
+err_of_depopulate:
+	of_platform_depopulate(dev);
  err_runtime_disable:
  	pm_runtime_put_noidle(dev);
  	pm_runtime_set_suspended(dev);
Hi,

this was sent duing the summer holidays. Since then, a few other patches 
have been merged in linux-next for this file.

So, this is a polite reminder.

CJ

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help