linux-kernel - [PATCH v3] i2c: ocores: add missing unwind goto in `ocores_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]

Message-Id: <20230418053814.117215-1-silver_code@hust.edu.cn>
Date:   Tue, 18 Apr 2023 13:38:13 +0800
From:   Wang Zhang <silver_code@...t.edu.cn>
To:     Peter Korsgaard <peter@...sgaard.com>, Andrew Lunn <andrew@...n.ch>
Cc:     hust-os-kernel-patches@...glegroups.com,
        Wang Zhang <silver_code@...t.edu.cn>,
        linux-i2c@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH v3] i2c: ocores: add missing unwind goto in `ocores_i2c_probe`

Smatch Warns:
drivers/i2c/busses/i2c-ocores.c:701 ocores_i2c_probe() warn:
missing unwind goto?

The error handling code after the err_clk label should be executed to
release any resources that were allocated for the clock if a negative
error code returned after platform_get_irq_optional.

Fix this by changing the direct return to `goto err_clk`. 

Signed-off-by: Wang Zhang <silver_code@...t.edu.cn>
---
v2->v3: the first patch had issues. Just do a much simpler fix. No need 
to add the check. clk_disable_unprepare() has checks for error pointer 
and NULL already.
v1->v2: change `ocores_i2c_of_probe` to use `devm_clk_get_enabled()`
---
This patch was found by static analyzer.
...
 drivers/i2c/busses/i2c-ocores.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index 2e575856c5cd..1df1439218c9 100644
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -700,8 +700,10 @@ static int ocores_i2c_probe(struct platform_device *pdev)
 	if (irq == -ENXIO) {
 		ocores_algorithm.master_xfer = ocores_xfer_polling;
 	} else {
-		if (irq < 0)
-			return irq;
+		if (irq < 0) {
+			ret = irq;
+			goto err_clk;
+		}
 	}
 
 	if (ocores_algorithm.master_xfer != ocores_xfer_polling) {
-- 
2.34.1