diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2014-01-10 13:36:41 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-10 19:54:35 -0500 |
commit | c63fe8f6ca3669f1d120ff70523e2911b9966574 (patch) | |
tree | d4f9e03eb7d36baf2753f00d42539ad9f36ff90b /drivers/usb/core | |
parent | 3569843a2b10a7f2163595fa2d499291147f7e94 (diff) |
usb: core: add sanity checks when using bInterfaceClass with new_id
Check if that field is actually used and if so, bail out if it exeeds a
u8. Make it also future-proof by not requiring "exactly three"
parameters in new_id, but simply "more than two".
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core')
-rw-r--r-- | drivers/usb/core/driver.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 8d989b1d3dc5..574f5a04c92d 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c | |||
@@ -60,7 +60,10 @@ ssize_t usb_store_new_id(struct usb_dynids *dynids, | |||
60 | dynid->id.idVendor = idVendor; | 60 | dynid->id.idVendor = idVendor; |
61 | dynid->id.idProduct = idProduct; | 61 | dynid->id.idProduct = idProduct; |
62 | dynid->id.match_flags = USB_DEVICE_ID_MATCH_DEVICE; | 62 | dynid->id.match_flags = USB_DEVICE_ID_MATCH_DEVICE; |
63 | if (fields == 3) { | 63 | if (fields > 2 && bInterfaceClass) { |
64 | if (bInterfaceClass > 255) | ||
65 | return -EINVAL; | ||
66 | |||
64 | dynid->id.bInterfaceClass = (u8)bInterfaceClass; | 67 | dynid->id.bInterfaceClass = (u8)bInterfaceClass; |
65 | dynid->id.match_flags |= USB_DEVICE_ID_MATCH_INT_CLASS; | 68 | dynid->id.match_flags |= USB_DEVICE_ID_MATCH_INT_CLASS; |
66 | } | 69 | } |