Skip to contentSkip to conversation

Fix some wrong goto jumps for avoiding memory leak.

PATCH In review zpershuai 2 participants 2 messages Jun 9, 2021 – Jun 12, 2021

Subsystems (2)
lore
Share & tools
lore

zpershuai

author
#0 lore raw

PATCH 1/1 Fix some wrong goto jumps for avoiding memory leak.

In meson_spifc_probe function, when enable the device pclk clock is error, it should use clk_disable_unprepare to release the core clock.

And when meson_spicc_clk_init returns failed, it should goto the out_clk label.

---
 drivers/spi/spi-meson-spicc.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/spi/spi-meson-spicc.c +5 -3
index ecba6b4..b2c4621 100644
@@ -725,7 +725,7 @@ static int meson_spicc_probe(struct platform_device *pdev)
 	ret = clk_prepare_enable(spicc->pclk);
 	if (ret) {
 		dev_err(&pdev->dev, "pclk clock enable failed\n");
-		goto out_master;
+		goto out_core_clk;
 	}
 
 	device_reset_optional(&pdev->dev);
@@ -752,7 +752,7 @@ static int meson_spicc_probe(struct platform_device *pdev)
 	ret = meson_spicc_clk_init(spicc);
 	if (ret) {
 		dev_err(&pdev->dev, "clock registration failed\n");
-		goto out_master;
+		goto out_clk;
 	}
 
 	ret = devm_spi_register_master(&pdev->dev, master);
@@ -764,9 +764,11 @@ static int meson_spicc_probe(struct platform_device *pdev)
 	return 0;
 
 out_clk:
-	clk_disable_unprepare(spicc->core);
 	clk_disable_unprepare(spicc->pclk);
 
+out_core_clk:
+	clk_disable_unprepare(spicc->core);
+
 out_master:
 	spi_master_put(master);
 
Signature · 1 line
2.7.4
#1 lore raw

Hello,

Quoted 6 lines · zpershuai

In meson_spifc_probe function, when enable the device pclk clock is error, it should use clk_disable_unprepare to release the core clock.

And when meson_spicc_clk_init returns failed, it should goto the out_clk label.

After reviewing your patch I agree with your findings! So thank you very much for bringing this up and sending a fix

The subject of this patch does not match what we usually have Can you please make it start with "spi: meson-spicc:" (see git log drivers/spi/spi-meson-spicc.c)

[...]

drivers/spi/spi-meson-spicc.c static int meson_spicc_probe(struct platform_device *pdev) · line 756

Quoted 8 lines
        device_reset_optional(&pdev->dev);
drivers/spi/spi-meson-spicc.c +1 -1
@@ -752,7 +752,7 @@ static int meson_spicc_probe(struct platform_device *pdev)
        ret = meson_spicc_clk_init(spicc);
        if (ret) {
                dev_err(&pdev->dev, "clock registration failed\n");
-               goto out_master;
+               goto out_clk;
        }

I'd prefer this part to go into a separate patch so that separate patch can get the following Fixes tag (which should then be added above your Signed-off-by):

Fixes 3e0cf4d3fc29 ("spi: meson-spicc: add a linear clock divider support")

The remaining changes (to my understanding) should get:

Fixes 454fa271bc4e ("spi: Add Meson SPICC driver")

The "Fixes" tag is relevant so bug-fixes can be backported to older kernel versions automatically.

So it would be great if you could send a second version with the above changes considered.

Thank you and best regards,
Martin