linux-kernel - [PATCH] soundwire: bus: fix missing error handling in sdw_bus_master

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]

Message-Id: <20251221114957.945463-1-lihaoxiang@isrc.iscas.ac.cn>
Date: Sun, 21 Dec 2025 19:49:57 +0800
From: Haoxiang Li <lihaoxiang@...c.iscas.ac.cn>
To: vkoul@...nel.org,
	yung-chuan.liao@...ux.intel.com,
	pierre-louis.bossart@...ux.dev
Cc: linux-sound@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Haoxiang Li <lihaoxiang@...c.iscas.ac.cn>
Subject: [PATCH] soundwire: bus: fix missing error handling in sdw_bus_master_add()

sdw_bus_master_add() lacks proper error handling, which may
lead to resource leakage. Fix this by adding corresponding
error handling operations.

Found by code review and compiled on ubuntu 20.04.

Signed-off-by: Haoxiang Li <lihaoxiang@...c.iscas.ac.cn>
---
 drivers/soundwire/bus.c | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
index fb68738dfb9b..0fb6ca164786 100644
--- a/drivers/soundwire/bus.c
+++ b/drivers/soundwire/bus.c
@@ -62,18 +62,20 @@ int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent,
 	if (ret < 0) {
 		dev_err(parent, "Failed to add master device at link %d\n",
 			bus->link_id);
-		return ret;
+		goto free_ida;
 	}
 
 	if (!bus->ops) {
 		dev_err(bus->dev, "SoundWire Bus ops are not set\n");
-		return -EINVAL;
+		ret = -EINVAL;
+		goto del_master_dev;
 	}
 
 	if (!bus->compute_params) {
 		dev_err(bus->dev,
 			"Bandwidth allocation not configured, compute_params no set\n");
-		return -EINVAL;
+		ret = -EINVAL;
+		goto del_master_dev;
 	}
 
 	/*
@@ -99,7 +101,7 @@ int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent,
 		if (ret < 0) {
 			dev_err(bus->dev,
 				"Bus read properties failed:%d\n", ret);
-			return ret;
+			goto unregister_key;
 		}
 	}
 
@@ -126,7 +128,7 @@ int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent,
 
 	ret = sdw_irq_create(bus, fwnode);
 	if (ret)
-		return ret;
+		goto exit_debugfs;
 
 	/*
 	 * SDW is an enumerable bus, but devices can be powered off. So,
@@ -144,8 +146,7 @@ int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent,
 
 	if (ret < 0) {
 		dev_err(bus->dev, "Finding slaves failed:%d\n", ret);
-		sdw_irq_delete(bus);
-		return ret;
+		goto delete_irq;
 	}
 
 	/*
@@ -164,6 +165,19 @@ int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent,
 	bus->params.next_bank = SDW_BANK1;
 
 	return 0;
+
+delete_irq:
+	sdw_irq_delete(bus);
+exit_debugfs:
+	sdw_bus_debugfs_exit(bus);
+unregister_key:
+	lockdep_unregister_key(&bus->bus_lock_key);
+	lockdep_unregister_key(&bus->msg_lock_key);
+del_master_dev:
+	sdw_master_device_del(bus);
+free_ida:
+	ida_free(&sdw_bus_ida, bus->id);
+	return ret;
 }
 EXPORT_SYMBOL(sdw_bus_master_add);
 
-- 
2.25.1