Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7661e9a authored by Colin Ian King's avatar Colin Ian King Committed by Greg Kroah-Hartman
Browse files

usbip: vudc: fix null pointer dereference on udc->lock 



commit df3334c223a033f562645712e832ca4cbb326bbf upstream.

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.

Fixes: ea6873a4 ("usbip: vudc: Add SysFS infrastructure for VUDC")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Acked-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
Reviewed-by: default avatarKrzysztof Opasiak <k.opasiak@samsung.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3fad4ea9

drivers/usb/usbip/vudc_sysfs.c

+6 −2
Original line number Diff line number Diff line
@@ -117,10 +117,14 @@ static ssize_t store_sockfd(struct device *dev, struct device_attribute *attr, 
	if (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;

	}