mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 07:38:10 +00:00
Code Issues Releases Wiki Activity

usbip: vudc synchronize sysfs code paths

Browse source 
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>
This commit is contained in:
Shuah Khan 2021-03-29 19:36:50 -06:00 committed by Greg Kroah-Hartman
parent 9dbf34a834
commit bd8b820422
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/usb/usbip/vudc_dev.c
View file

@ -572,6 +572,7 @@ static int init_vudc_hw(struct vudc *udc)
init_waitqueue_head(&udc->tx_waitq); init_waitqueue_head(&udc->tx_waitq);
spin_lock_init(&ud->lock); spin_lock_init(&ud->lock);
mutex_init(&ud->sysfs_lock);
ud->status = SDEV_ST_AVAILABLE; ud->status = SDEV_ST_AVAILABLE;
ud->side = USBIP_VUDC; ud->side = USBIP_VUDC;

5
drivers/usb/usbip/vudc_sysfs.c
View file

@ -112,6 +112,7 @@ static ssize_t usbip_sockfd_store(struct device *dev,
dev_err(dev, "no device"); dev_err(dev, "no device");
return -ENODEV; return -ENODEV;
} }
mutex_lock(&udc->ud.sysfs_lock);
spin_lock_irqsave(&udc->lock, flags); spin_lock_irqsave(&udc->lock, flags);
/* Don't export what we don't have */ /* Don't export what we don't have */
if (!udc->driver || !udc->pullup) { if (!udc->driver || !udc->pullup) {
@ -187,6 +188,8 @@ static ssize_t usbip_sockfd_store(struct device *dev,
wake_up_process(udc->ud.tcp_rx); wake_up_process(udc->ud.tcp_rx);
wake_up_process(udc->ud.tcp_tx); wake_up_process(udc->ud.tcp_tx);
mutex_unlock(&udc->ud.sysfs_lock);
return count; return count;
} else { } else {
@ -207,6 +210,7 @@ static ssize_t usbip_sockfd_store(struct device *dev,
} }
spin_unlock_irqrestore(&udc->lock, flags); spin_unlock_irqrestore(&udc->lock, flags);
mutex_unlock(&udc->ud.sysfs_lock);
return count; return count;
@ -216,6 +220,7 @@ static ssize_t usbip_sockfd_store(struct device *dev,
spin_unlock_irq(&udc->ud.lock); spin_unlock_irq(&udc->ud.lock);
unlock: unlock:
spin_unlock_irqrestore(&udc->lock, flags); spin_unlock_irqrestore(&udc->lock, flags);
mutex_unlock(&udc->ud.sysfs_lock);
return ret; return ret;
} }