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.

Mot-CRs-fixed: (CR)
CVE-Fixed: CVE-2022-24958
Bug: 220261709

Change-Id: I23cec10055ab201823b80bdc85f6488a0d63fb2e
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>
Signed-off-by: Gajjala Chakradhar <gajjalac@motorola.com>
Reviewed-on: https://gerrit.mot.com/2276114
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key

diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
index f5936d17bd91ca05af4709d3fa506f34cb36446e..dfaa48f2eb9925bc9139a6279dd8b991de584094 100644 (file)
--- a/drivers/usb/gadget/legacy/inode.c
+++ b/drivers/usb/gadget/legacy/inode.c
@@ -1883,8 +1883,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
@@ -1901,6 +1901,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);