memory: renesas-rpc-if: fix platform-device leak in error path

[PATCH] memory: renesas-rpc-if: fix platform-device leak in error path

Posted by Johan Hovold 4 years, 3 months ago

Make sure to free the flash platform device in the event that
registration fails during probe.

Fixes: ca7d8b980b67 ("memory: add Renesas RPC-IF driver")
Cc: stable@vger.kernel.org      # 5.8
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/memory/renesas-rpc-if.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/memory/renesas-rpc-if.c b/drivers/memory/renesas-rpc-if.c
index e4cc64f56019..2e545f473cc6 100644
--- a/drivers/memory/renesas-rpc-if.c
+++ b/drivers/memory/renesas-rpc-if.c
@@ -651,6 +651,7 @@ static int rpcif_probe(struct platform_device *pdev)
 	struct platform_device *vdev;
 	struct device_node *flash;
 	const char *name;
+	int ret;
 
 	flash = of_get_next_child(pdev->dev.of_node, NULL);
 	if (!flash) {
@@ -674,7 +675,14 @@ static int rpcif_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	vdev->dev.parent = &pdev->dev;
 	platform_set_drvdata(pdev, vdev);
-	return platform_device_add(vdev);
+
+	ret = platform_device_add(vdev);
+	if (ret) {
+		platform_device_put(vdev);
+		return ret;
+	}
+
+	return 0;
 }
 
 static int rpcif_remove(struct platform_device *pdev)
-- 
2.34.1

Re: [PATCH] memory: renesas-rpc-if: fix platform-device leak in error path

Posted by Krzysztof Kozlowski 4 years, 3 months ago

On 03/03/2022 19:06, Johan Hovold wrote:
> Make sure to free the flash platform device in the event that
> registration fails during probe.
> 
> Fixes: ca7d8b980b67 ("memory: add Renesas RPC-IF driver")
> Cc: stable@vger.kernel.org      # 5.8
> Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---
>  drivers/memory/renesas-rpc-if.c | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 

It's too late for upcoming cycle, so I will pick it up after the merge
window.


Best regards,
Krzysztof

Re: [PATCH] memory: renesas-rpc-if: fix platform-device leak in error path

Posted by Krzysztof Kozlowski 4 years, 2 months ago

On Thu, 3 Mar 2022 19:06:32 +0100, Johan Hovold wrote:
> Make sure to free the flash platform device in the event that
> registration fails during probe.
> 
> 

Applied, thanks!

[1/1] memory: renesas-rpc-if: fix platform-device leak in error path
      commit: b452dbf24d7d9a990d70118462925f6ee287d135

Best regards,
-- 
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>