Bugs fixing for USB composite gadget driver
cover Bugs fixing for USB composite gadget driver
Hi Greg,
I found 2 issues when I was developing USB Audio gadget driver. Please take a look.
Thanks
-Bryan
PATCH 1/2 usb: composite: Fix bug: should test set_alt function pointer before use it
--- drivers/usb/gadget/composite.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/usb/gadget/composite.c +1 -1
@@ -772,7 +772,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) f = cdev->config->interface[w_index];if (!f)break ; -if (w_value && !f->get_alt) +if (w_value && !f->set_alt)break ; value = f->set_alt (f, w_index, w_value);break ;
Signature · 1 line
1.5.6
Re: [PATCH 1/2] usb: composite: Fix bug: should test set_alt function pointer before use it
Quoted 1 line · Bryan Wu
Signed-off-by Bryan Wu <[email protected]>
Include a real patch comment -- "test the *correct* function pointer" would suffice, and:
Quoted 26 lines
--- drivers/usb/gadget/composite.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/usb/gadget/composite.c +1
-1@@ -772,7 +772,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) f = cdev->config->interface[w_index];if (!f)break ; -if (w_value && !f->get_alt) +if (w_value && !f->set_alt)break ; value = f->set_alt (f, w_index, w_value);break ;Signature · 6 lines
1.5.6 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 2/2 usb: composite: Fix bug: low byte of w_index is the usb interface number not the whole 2 bytes of w_index
In reply to Bryan WuIn some usb gadget driver, for example usb audio class device, the high byte of w_index is the entity id and low byte is the interface number. If we use the 2 bytes of w_index as the array number, we will get a wrong pointer or NULL pointer.
This patch fixes this issue.
--- drivers/usb/gadget/composite.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
drivers/usb/gadget/composite.c +4 -3
@@ -683,6 +683,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)struct usb_request *req = cdev->req;int value = -EOPNOTSUPP ;u16 w_index =le16_to_cpu (ctrl->wIndex); +u8 intf = w_index &0xFF ;u16 w_value =le16_to_cpu (ctrl->wValue);u16 w_length =le16_to_cpu (ctrl->wLength);struct usb_function *f =NULL ;
@@ -769,7 +770,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) goto unknown;if (!cdev->config || w_index >=MAX_CONFIG_INTERFACES )break ; - f = cdev->config->interface[w_index]; + f = cdev->config->interface[intf];if (!f)break ;if (w_value && !f->set_alt)
@@ -781,7 +782,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) goto unknown;if (!cdev->config || w_index >=MAX_CONFIG_INTERFACES )break ; - f = cdev->config->interface[w_index]; + f = cdev->config->interface[intf];if (!f)break ;/* lots of interfaces only need altsetting zero... */
@@ -808,7 +809,7 @@ unknown:*/ if ((ctrl->bRequestType &USB_RECIP_MASK ) ==USB_RECIP_INTERFACE ) { - f = cdev->config->interface[w_index]; + f = cdev->config->interface[intf];if (f && f->setup) value = f->setup (f, ctrl);else
Signature · 1 line
1.5.6
Re: [PATCH 2/2] usb: composite: Fix bug: low byte of w_index is the usb interface number not the whole 2 bytes of w_index
Quoted 8 lines · Bryan Wu
In some usb gadget driver, for example usb audio class device, the high byte of
w_indexis the entity id and low byte is the interface number. If we use the 2 bytes ofw_indexas the array number, we will get a wrong pointer or NULL pointer.This patch fixes this issue.
Signed-off-by Bryan Wu <[email protected]>
Quoted 52 lines
--- drivers/usb/gadget/composite.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)drivers/usb/gadget/composite.c +4
-3@@ -683,6 +683,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)struct usb_request *req = cdev->req;int value = -EOPNOTSUPP ;u16 w_index =le16_to_cpu (ctrl->wIndex); +u8 intf = w_index &0xFF ;u16 w_value =le16_to_cpu (ctrl->wValue);u16 w_length =le16_to_cpu (ctrl->wLength);struct usb_function *f =NULL ;@@ -769,7 +770,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) goto unknown;if (!cdev->config || w_index >=MAX_CONFIG_INTERFACES )break ; - f = cdev->config->interface[w_index]; + f = cdev->config->interface[intf];if (!f)break ;if (w_value && !f->set_alt)@@ -781,7 +782,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) goto unknown;if (!cdev->config || w_index >=MAX_CONFIG_INTERFACES )break ; - f = cdev->config->interface[w_index]; + f = cdev->config->interface[intf];if (!f)break ;/* lots of interfaces only need altsetting zero... */ @@ -808,7 +809,7 @@ unknown:*/ if ((ctrl->bRequestType &USB_RECIP_MASK ) ==USB_RECIP_INTERFACE ) { - f = cdev->config->interface[w_index]; + f = cdev->config->interface[intf];if (f && f->setup) value = f->setup (f, ctrl);else Signature · 6 lines
1.5.6 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html