patch "usbip: vudc: fix null pointer dereference on udc->lock" added to usb-linus
Subsystems (3)
This is a note to let you know that I've just added the patch titled
usbip: vudc: fix null pointer dereference on udc->lock
to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
Quoted 1 line
From
df3334c223a033f562645712e832ca4cbb326bbfMon Sep 17 00:00:00 2001
From: Colin Ian King <[email protected]>
Date: Thu, 22 Feb 2018 17:39:17 +0000
Subject: usbip: vudc: fix null pointer dereference on udc->lock
Currently the driver attempts to spin lock on udc->lock before a NULL pointer check is performed on udc, hence there is a potential null pointer dereference on udc->lock. Fix this by moving the null check on udc before the lock occurs.
--- drivers/usb/usbip/vudc_sysfs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/usb/usbip/vudc_sysfs.c +6 -2
@@ -105,10 +105,14 @@ static ssize_t usbip_sockfd_store(struct device *dev, struct device_attribute *aif (rv !=0 )return -EINVAL ; +if (!udc) { +dev_err (dev,"no device" ); +return -ENODEV ; + }spin_lock_irqsave (&udc->lock, flags);/* Don't export what we don't have */ -if (!udc || !udc->driver || !udc->pullup) { -dev_err (dev,"no device or gadget not bound" ); +if (!udc->driver || !udc->pullup) { +dev_err (dev,"gadget not bound" ); ret = -ENODEV ; goto unlock; }
Signature · 1 line
2.16.2