Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usbip: vudc synchronize sysfs code paths

Fuzzing uncovered race condition between sysfs code paths in usbip
drivers. Device connect/disconnect code paths initiated through
sysfs interface are prone to races if disconnect happens during
connect and vice versa.

Use sysfs_lock to protect sysfs paths in vudc.

Cc: stable@vger.kernel.org
Reported-and-tested-by: syzbot+a93fba6d384346a761e3@syzkaller.appspotmail.com
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Link: https://lore.kernel.org/r/caabcf3fc87bdae970509b5ff32d05bb7ce2fb15.1616807117.git.skhan@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Shuah Khan and committed by
Greg Kroah-Hartman
bd8b8204 9dbf34a8

+6
+1
drivers/usb/usbip/vudc_dev.c
··· 572 572 init_waitqueue_head(&udc->tx_waitq); 573 573 574 574 spin_lock_init(&ud->lock); 575 + mutex_init(&ud->sysfs_lock); 575 576 ud->status = SDEV_ST_AVAILABLE; 576 577 ud->side = USBIP_VUDC; 577 578
+5
drivers/usb/usbip/vudc_sysfs.c
··· 112 112 dev_err(dev, "no device"); 113 113 return -ENODEV; 114 114 } 115 + mutex_lock(&udc->ud.sysfs_lock); 115 116 spin_lock_irqsave(&udc->lock, flags); 116 117 /* Don't export what we don't have */ 117 118 if (!udc->driver || !udc->pullup) { ··· 188 187 189 188 wake_up_process(udc->ud.tcp_rx); 190 189 wake_up_process(udc->ud.tcp_tx); 190 + 191 + mutex_unlock(&udc->ud.sysfs_lock); 191 192 return count; 192 193 193 194 } else { ··· 210 207 } 211 208 212 209 spin_unlock_irqrestore(&udc->lock, flags); 210 + mutex_unlock(&udc->ud.sysfs_lock); 213 211 214 212 return count; 215 213 ··· 220 216 spin_unlock_irq(&udc->ud.lock); 221 217 unlock: 222 218 spin_unlock_irqrestore(&udc->lock, flags); 219 + mutex_unlock(&udc->ud.sysfs_lock); 223 220 224 221 return ret; 225 222 }