diff options
| author | Hangyu Hua <hbh25y@gmail.com> | 2022-01-01 01:21:38 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-03-08 19:04:07 +0100 |
| commit | 6b432b7b5a77e8bfd041da0ba00c98fa31097c4e (patch) | |
| tree | 9413fa17dd1d29507e31cc917edb12124cf79d54 | |
| parent | 70196d12856306a17ddc3eae0f022b9c1d748e52 (diff) | |
| download | linux-stable-6b432b7b5a77e8bfd041da0ba00c98fa31097c4e.tar.gz linux-stable-6b432b7b5a77e8bfd041da0ba00c98fa31097c4e.tar.bz2 linux-stable-6b432b7b5a77e8bfd041da0ba00c98fa31097c4e.zip | |
usb: gadget: clear related members when goto fail
commit 501e38a5531efbd77d5c73c0ba838a889bfc1d74 upstream.
dev->config and dev->hs_config and dev->dev need to be cleaned if
dev_config fails to avoid UAF.
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
Link: https://lore.kernel.org/r/20211231172138.7993-3-hbh25y@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/gadget/legacy/inode.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c index 94012eca0ccb..3ebcbd199a79 100644 --- a/drivers/usb/gadget/legacy/inode.c +++ b/drivers/usb/gadget/legacy/inode.c @@ -1877,8 +1877,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 @@ -1895,6 +1895,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); |