linux-kernel - [PATCH] usb: ulpi: fix a double free in ulpi_register

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: <20251219154859.650819-1-lihaoxiang@isrc.iscas.ac.cn>
Date: Fri, 19 Dec 2025 23:48:59 +0800
From: Haoxiang Li <lihaoxiang@...c.iscas.ac.cn>
To: heikki.krogerus@...ux.intel.com,
	gregkh@...uxfoundation.org,
	sean.anderson@...o.com
Cc: linux-usb@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Haoxiang Li <lihaoxiang@...c.iscas.ac.cn>,
	stable@...r.kernel.org
Subject: [PATCH] usb: ulpi: fix a double free in ulpi_register_interface()

If ulpi_register() fails, put_device() is called in ulpi_register(),
kfree() in ulpi_register_interface() will result in a double free.

Also, refactor the device registration sequence to use a unified
put_device() cleanup path, addressing multiple error returns in
ulpi_register().

Found by code review and compiled on ubuntu 20.04.

Fixes: 0a907ee9d95e ("usb: ulpi: Call of_node_put correctly")
Cc: stable@...r.kernel.org
Signed-off-by: Haoxiang Li <lihaoxiang@...c.iscas.ac.cn>
---
 drivers/usb/common/ulpi.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c
index 4a2ee447b213..c81a0cb24067 100644
--- a/drivers/usb/common/ulpi.c
+++ b/drivers/usb/common/ulpi.c
@@ -278,6 +278,7 @@ static int ulpi_register(struct device *dev, struct ulpi *ulpi)
 	int ret;
 	struct dentry *root;
 
+	device_initialize(&ulpi->dev);
 	ulpi->dev.parent = dev; /* needed early for ops */
 	ulpi->dev.bus = &ulpi_bus;
 	ulpi->dev.type = &ulpi_dev_type;
@@ -287,19 +288,15 @@ static int ulpi_register(struct device *dev, struct ulpi *ulpi)
 
 	ret = ulpi_of_register(ulpi);
 	if (ret)
-		return ret;
+		goto err_register;
 
 	ret = ulpi_read_id(ulpi);
-	if (ret) {
-		of_node_put(ulpi->dev.of_node);
-		return ret;
-	}
+	if (ret)
+		goto err_register;
 
-	ret = device_register(&ulpi->dev);
-	if (ret) {
-		put_device(&ulpi->dev);
-		return ret;
-	}
+	ret = device_add(&ulpi->dev);
+	if (ret)
+		goto err_register;
 
 	root = debugfs_create_dir(dev_name(&ulpi->dev), ulpi_root);
 	debugfs_create_file("regs", 0444, root, ulpi, &ulpi_regs_fops);
@@ -308,6 +305,10 @@ static int ulpi_register(struct device *dev, struct ulpi *ulpi)
 		ulpi->id.vendor, ulpi->id.product);
 
 	return 0;
+
+err_register:
+	put_device(&ulpi->dev);
+	return ret;
 }
 
 /**
@@ -331,10 +332,8 @@ struct ulpi *ulpi_register_interface(struct device *dev,
 	ulpi->ops = ops;
 
 	ret = ulpi_register(dev, ulpi);
-	if (ret) {
-		kfree(ulpi);
+	if (ret)
 		return ERR_PTR(ret);
-	}
 
 	return ulpi;
 }
-- 
2.25.1