usb: gadget: use after free in dev_config
v4 cover usb: gadget: use after free in dev_config
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.
v2:
1. break one patch up into two separate patches.
2. use "fail:" to clear all members.
v3:
fix a mistake in [PATCH v3 2/2]
v4:
avoid multiple unnecessary statement labels in [PATCH v4 2/2]
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
PATCH v4 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
@@ -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
Re: [PATCH v4 1/2] usb: gadget: don't release an existing dev->buf
Quoted 5 lines · Hangyu Hua
dev->bufdoes not need to be released if it already exists before executingdev_config.Signed-off-by Hangyu Hua <[email protected]>---
Quoted 21 lines
drivers/usb/gadget/legacy/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/usb/gadget/legacy/inode.c +2
-1@@ -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
PATCH v4 2/2 usb: gadget: clear related members when goto fail
In reply to Hangyu Huadev->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
@@ -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
Re: [PATCH v4 2/2] usb: gadget: clear related members when goto fail
Quoted 5 lines · Hangyu Hua
dev->configanddev->hs_configanddev->devneed to be cleaned ifdev_configfails to avoid UAF.Signed-off-by Hangyu Hua <[email protected]>---
Quoted 31 lines
drivers/usb/gadget/legacy/inode.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)drivers/usb/gadget/legacy/inode.c +5
-2@@ -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