diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-19 00:44:36 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-19 00:44:35 -0800 |
| commit | 95fc2dedfded3c81ecb520e4f807c335cb2c8644 (patch) | |
| tree | 977cd524fa503a7cbeb210e6cea70f0c92a3aec2 | |
| parent | d763842b90f2ad43a7f48749cb9bc1e1565983a9 (diff) | |
| parent | ca8e442e9f5b57215474e44bac080f5ac46d5560 (diff) | |
Merge "usb: gadget: composite: Add spinlock protection for usb string descriptor"
| -rw-r--r-- | drivers/usb/gadget/composite.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index a480b0a9a238..9360b0613154 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1670,8 +1670,10 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) value = min(w_length, (u16) value); break; case USB_DT_STRING: + spin_lock(&cdev->lock); value = get_string(cdev, req->buf, w_index, w_value & 0xff); + spin_unlock(&cdev->lock); if (value >= 0) value = min(w_length, (u16) value); break; |