Commit c63fe8f6 authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman

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: default avatarWolfram Sang <wsa@the-dreams.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3569843a
...@@ -60,7 +60,10 @@ ssize_t usb_store_new_id(struct usb_dynids *dynids, ...@@ -60,7 +60,10 @@ ssize_t usb_store_new_id(struct usb_dynids *dynids,
dynid->id.idVendor = idVendor; dynid->id.idVendor = idVendor;
dynid->id.idProduct = idProduct; dynid->id.idProduct = idProduct;
dynid->id.match_flags = USB_DEVICE_ID_MATCH_DEVICE; dynid->id.match_flags = USB_DEVICE_ID_MATCH_DEVICE;
if (fields == 3) { if (fields > 2 && bInterfaceClass) {
if (bInterfaceClass > 255)
return -EINVAL;
dynid->id.bInterfaceClass = (u8)bInterfaceClass; dynid->id.bInterfaceClass = (u8)bInterfaceClass;
dynid->id.match_flags |= USB_DEVICE_ID_MATCH_INT_CLASS; dynid->id.match_flags |= USB_DEVICE_ID_MATCH_INT_CLASS;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment