diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-20 14:04:21 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-20 14:04:21 -0800 |
| commit | 12fdb0f7511df9b5af831cd8e601100c57506e66 (patch) | |
| tree | 08ae7ca174f3fc8c5a92772ec27624b7a1004429 /drivers/usb | |
| parent | 0de55d669a4a95ff0d9205cb138a0e54e9972410 (diff) | |
| parent | d4d45536aee4b02ee7872381eee3ec9b8b78858a (diff) | |
Merge "usb: gadget: composite: Add spinlock protection for usb config descriptor"
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/composite.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 30edea3ba556..5a416777e69a 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1655,7 +1655,9 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) if (!gadget_is_dualspeed(gadget) || gadget->speed >= USB_SPEED_SUPER) break; + spin_lock(&cdev->lock); device_qual(cdev); + spin_unlock(&cdev->lock); value = min_t(int, w_length, sizeof(struct usb_qualifier_descriptor)); break; @@ -1665,7 +1667,9 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) break; /* FALLTHROUGH */ case USB_DT_CONFIG: + spin_lock(&cdev->lock); value = config_desc(cdev, w_value); + spin_unlock(&cdev->lock); if (value >= 0) value = min(w_length, (u16) value); break; |