Skip to content

Commit 5f0b5f4

Browse files
schspagregkh
authored andcommitted
usb: gadget: fix race when gadget driver register via ioctl
The usb_gadget_register_driver can be called multi time by to threads via USB_RAW_IOCTL_RUN ioctl syscall, which will lead to multiple registrations. Call trace: driver_register+0x220/0x3a0 drivers/base/driver.c:171 usb_gadget_register_driver_owner+0xfb/0x1e0 drivers/usb/gadget/udc/core.c:1546 raw_ioctl_run drivers/usb/gadget/legacy/raw_gadget.c:513 [inline] raw_ioctl+0x1883/0x2730 drivers/usb/gadget/legacy/raw_gadget.c:1220 ioctl USB_RAW_IOCTL_RUN This routine allows two processes to register the same driver instance via ioctl syscall. which lead to a race condition. Please refer to the following scenarios. T1 T2 ------------------------------------------------------------------ usb_gadget_register_driver_owner driver_register driver_register driver_find driver_find bus_add_driver bus_add_driver priv alloced <context switch> drv->p = priv; <schedule out> kobject_init_and_add // refcount = 1; //couldn't find an available UDC or it's busy <context switch> priv alloced drv->priv = priv; kobject_init_and_add ---> refcount = 1 <------ // register success <context switch> ===================== another ioctl/process ====================== driver_register driver_find k = kset_find_obj() ---> refcount = 2 <------ <context out> driver_unregister // drv->p become T2's priv ---> refcount = 1 <------ <context switch> kobject_put(k) ---> refcount = 0 <------ return priv->driver; --------UAF here---------- There will be UAF in this scenario. We can fix it by adding a new STATE_DEV_REGISTERING device state to avoid double register. Reported-by: [email protected] Link: https://lore.kernel.org/all/[email protected]/ Reviewed-by: Andrey Konovalov <[email protected]> Signed-off-by: Schspa Shi <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 4031cd9 commit 5f0b5f4

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/usb/gadget/legacy/raw_gadget.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ enum dev_state {
145145
STATE_DEV_INVALID = 0,
146146
STATE_DEV_OPENED,
147147
STATE_DEV_INITIALIZED,
148+
STATE_DEV_REGISTERING,
148149
STATE_DEV_RUNNING,
149150
STATE_DEV_CLOSED,
150151
STATE_DEV_FAILED
@@ -508,6 +509,7 @@ static int raw_ioctl_run(struct raw_dev *dev, unsigned long value)
508509
ret = -EINVAL;
509510
goto out_unlock;
510511
}
512+
dev->state = STATE_DEV_REGISTERING;
511513
spin_unlock_irqrestore(&dev->lock, flags);
512514

513515
ret = usb_gadget_probe_driver(&dev->driver);

0 commit comments

Comments
 (0)