Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58b419d1 authored by Hangyu Hua's avatar Hangyu Hua Committed by Greg Kroah-Hartman
Browse files

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: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarHangyu Hua <hbh25y@gmail.com>
Link: https://lore.kernel.org/r/20211231172138.7993-3-hbh25y@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ba6fdd55

drivers/usb/gadget/legacy/inode.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -1878,8 +1878,8 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) 




	value = usb_gadget_probe_driver(&gadgetfs_driver);

	value = usb_gadget_probe_driver(&gadgetfs_driver);

	if (value != 0) {

	if (value != 0) {

		kfree (dev->buf);

		spin_lock_irq(&dev->lock);

		dev->buf = NULL;

		goto fail;

	} else {

	} else {

		/* at this point "good" hardware has for the first time

		/* at this point "good" hardware has for the first time

		 * let the USB the host see us.  alternatively, if users

		 * let the USB the host see us.  alternatively, if users
@@ -1896,6 +1896,9 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) 
	return value;

	return value;





fail:

fail:

	dev->config = NULL;

	dev->hs_config = NULL;

	dev->dev = NULL;

	spin_unlock_irq (&dev->lock);

	spin_unlock_irq (&dev->lock);

	pr_debug ("%s: %s fail %zd, %p\n", shortname, __func__, value, dev);

	pr_debug ("%s: %s fail %zd, %p\n", shortname, __func__, value, dev);

	kfree (dev->buf);

	kfree (dev->buf);