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

Commit 1023cde2 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: composite: Add spinlock protection for usb string descriptor"

parents 3059d07b f4cbcab1

drivers/usb/gadget/composite.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1815,8 +1815,10 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
				value = min(w_length, (u16) value);

				value = min(w_length, (u16) value);

			break;

			break;

		case USB_DT_STRING:

		case USB_DT_STRING:

			spin_lock(&cdev->lock);

			value = get_string(cdev, req->buf,

			value = get_string(cdev, req->buf,

					w_index, w_value & 0xff);

					w_index, w_value & 0xff);

			spin_unlock(&cdev->lock);

			if (value >= 0)

			if (value >= 0)

				value = min(w_length, (u16) value);

				value = min(w_length, (u16) value);

			break;

			break;