Skip to contentSkip to conversation

usb: gadget: use after free in dev_config

PATCH New Hangyu Hua 1 participant 3 messages Mar 1, 2022

Subsystems (2)
lore
Share & tools
lore

Hangyu Hua

author
#0 lore raw

cover usb: gadget: use after free in dev_config

Author: Hangyu Hua <[email protected]>
commit 89f3594d0de5 ("usb: gadget: don't release an existing dev->buf")

Author: Hangyu Hua <[email protected]>
commit 501e38a5531e ("usb: gadget: clear related members when goto fail")

Add two commits to all stable branches.

There are two bugs:
dev->buf does not need to be released if it already exists before executing dev_config.
dev->config and dev->hs_config and dev->dev need to be cleaned if dev_config fails to avoid UAF.

Hangyu Hua (2):
usb: gadget: don't release an existing dev->buf
usb: gadget: clear related members when goto fail

 drivers/usb/gadget/legacy/inode.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 1/2 usb: gadget: don't release an existing dev->buf

dev->buf does not need to be released if it already exists before executing dev_config.

---
 drivers/usb/gadget/legacy/inode.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/gadget/legacy/inode.c +2 -1
index 3b58f4fc0a80..eaad03c0252f 100644
@@ -1826,8 +1826,9 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
 	spin_lock_irq (&dev->lock);
 	value = -EINVAL;
 	if (dev->buf) {
+		spin_unlock_irq(&dev->lock);
 		kfree(kbuf);
-		goto fail;
+		return value;
 	}
 	dev->buf = kbuf;
 
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH 2/2 usb: gadget: clear related members when goto fail

In reply to Hangyu Hua

dev->config and dev->hs_config and dev->dev need to be cleaned if dev_config fails to avoid UAF.

---
 drivers/usb/gadget/legacy/inode.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/usb/gadget/legacy/inode.c +5 -2
index eaad03c0252f..25c8809e0a38 100644
@@ -1875,8 +1875,8 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
 
 	value = usb_gadget_probe_driver(&gadgetfs_driver);
 	if (value != 0) {
-		kfree (dev->buf);
-		dev->buf = NULL;
+		spin_lock_irq(&dev->lock);
+		goto fail;
 	} else {
 		/* at this point "good" hardware has for the first time
 		 * let the USB the host see us.  alternatively, if users
@@ -1893,6 +1893,9 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
 	return value;
 
 fail:
+	dev->config = NULL;
+	dev->hs_config = NULL;
+	dev->dev = NULL;
 	spin_unlock_irq (&dev->lock);
 	pr_debug ("%s: %s fail %zd, %p\n", shortname, __func__, value, dev);
 	kfree (dev->buf);
Signature · 1 line
2.25.1