linux-kernel - [PATCH v2] usb: misc: onboard_usb_hub: Disable the USB hub clock on failure

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>] [day] [month] [year] [list]

Date: Tue,  9 Apr 2024 13:29:10 -0300
From: Fabio Estevam <festevam@...il.com>
To: gregkh@...uxfoundation.org
Cc: mka@...omium.org,
	frieder.schrempf@...tron.de,
	linux-usb@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Fabio Estevam <festevam@...x.de>
Subject: [PATCH v2] usb: misc: onboard_usb_hub: Disable the USB hub clock on failure

From: Fabio Estevam <festevam@...x.de>

In case regulator_bulk_enable() fails, the previously enabled USB hub
clock should be disabled.

Fix it accordingly.

Fixes: 65e62b8a955a ("usb: misc: onboard_usb_hub: Add support for clock input")
Signed-off-by: Fabio Estevam <festevam@...x.de>
Reviewed-by: Frieder Schrempf <frieder.schrempf@...tron.de>
Acked-by: Matthias Kaehlcke <mka@...omium.org>
---
Changes since v1:
- Rebased against 6.9-rc2.
- Collected tags.

 drivers/usb/misc/onboard_usb_hub.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/misc/onboard_usb_hub.c b/drivers/usb/misc/onboard_usb_hub.c
index c6101ed2d9d4..d8049275a023 100644
--- a/drivers/usb/misc/onboard_usb_hub.c
+++ b/drivers/usb/misc/onboard_usb_hub.c
@@ -78,7 +78,7 @@ static int onboard_hub_power_on(struct onboard_hub *hub)
 	err = regulator_bulk_enable(hub->pdata->num_supplies, hub->supplies);
 	if (err) {
 		dev_err(hub->dev, "failed to enable supplies: %pe\n", ERR_PTR(err));
-		return err;
+		goto disable_clk;
 	}
 
 	fsleep(hub->pdata->reset_us);
@@ -87,6 +87,10 @@ static int onboard_hub_power_on(struct onboard_hub *hub)
 	hub->is_powered_on = true;
 
 	return 0;
+
+disable_clk:
+	clk_disable_unprepare(hub->clk);
+	return err;
 }
 
 static int onboard_hub_power_off(struct onboard_hub *hub)
-- 
2.34.1