linux-kernel - [PATCH] i2c: bcm2835: Fix error handling in bcm2835_i2c

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Sun,  3 Apr 2022 06:33:08 +0000
From:   Miaoqian Lin <linmq006@...il.com>
To:     Florian Fainelli <f.fainelli@...il.com>,
        Ray Jui <rjui@...adcom.com>,
        Scott Branden <sbranden@...adcom.com>,
        bcm-kernel-feedback-list@...adcom.com,
        Nicolas Saenz Julienne <nsaenz@...nel.org>,
        Wolfram Sang <wsa@...nel.org>,
        Stefan Wahren <stefan.wahren@...e.com>,
        Miaoqian Lin <linmq006@...il.com>,
        Eric Anholt <eric@...olt.net>,
        Lad Prabhakar <prabhakar.mahadev-lad.rj@...renesas.com>,
        Annaliese McDermond <nh6z@...z.net>, linux-i2c@...r.kernel.org,
        linux-rpi-kernel@...ts.infradead.org,
        linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: [PATCH] i2c: bcm2835: Fix error handling in bcm2835_i2c_probe

In the error handling path, the clk_prepare_enable() function
call should be balanced by a corresponding 'clk_disable_unprepare()'
call. And clk_set_rate_exclusive calls clk_rate_exclusive_get(),
it should be balanced with call to clk_rate_exclusive_put().
, as already done in the remove function.

Fixes: bebff81fb8b9 ("i2c: bcm2835: Model Divider in CCF")
Signed-off-by: Miaoqian Lin <linmq006@...il.com>
---
 drivers/i2c/busses/i2c-bcm2835.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
index 5149454eef4a..d794448866a7 100644
--- a/drivers/i2c/busses/i2c-bcm2835.c
+++ b/drivers/i2c/busses/i2c-bcm2835.c
@@ -454,18 +454,21 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
 	ret = clk_prepare_enable(i2c_dev->bus_clk);
 	if (ret) {
 		dev_err(&pdev->dev, "Couldn't prepare clock");
-		return ret;
+		goto err_put_clk;
 	}
 
 	i2c_dev->irq = platform_get_irq(pdev, 0);
-	if (i2c_dev->irq < 0)
-		return i2c_dev->irq;
+	if (i2c_dev->irq < 0) {
+		ret =  i2c_dev->irq;
+		goto err_disable_clk;
+	}
 
 	ret = request_irq(i2c_dev->irq, bcm2835_i2c_isr, IRQF_SHARED,
 			  dev_name(&pdev->dev), i2c_dev);
 	if (ret) {
 		dev_err(&pdev->dev, "Could not request IRQ\n");
-		return -ENODEV;
+		ret = -ENODEV;
+		goto err_disable_clk;
 	}
 
 	adap = &i2c_dev->adapter;
@@ -489,8 +492,16 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
 
 	ret = i2c_add_adapter(adap);
 	if (ret)
-		free_irq(i2c_dev->irq, i2c_dev);
+		goto err_free_irq;
+
+	return ret;
 
+err_free_irq:
+	free_irq(i2c_dev->irq, i2c_dev);
+err_disable_clk:
+	clk_disable_unprepare(i2c_dev->bus_clk);
+err_put_clk:
+	clk_rate_exclusive_put(i2c_dev->bus_clk);
 	return ret;
 }
 
-- 
2.17.1