Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usb: raw-gadget: return -EINVAL if no proper ep address available

If we try to use raw_ioctl_ep_enable() for ep5in on a hardware that
only support from ep1-ep4 for both in and out direction, it will return
-EBUSY originally.

I think it will be more intuitive if we return -EINVAL, because -EBUSY
sounds like ep5in is not available now, but might be available in the
future.

Reviewed-by: Andrey Konovalov <andreyknvl@gmail.com>
Signed-off-by: Wei Ming Chen <jj251510319013@gmail.com>
Link: https://lore.kernel.org/r/20220311082944.4881-1-jj251510319013@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Wei Ming Chen and committed by
Greg Kroah-Hartman
0d48aee6 801109b1

+11 -4
+11 -4
drivers/usb/gadget/legacy/raw_gadget.c
··· 758 758 unsigned long flags; 759 759 struct usb_endpoint_descriptor *desc; 760 760 struct raw_ep *ep; 761 + bool ep_props_matched = false; 761 762 762 763 desc = memdup_user((void __user *)value, sizeof(*desc)); 763 764 if (IS_ERR(desc)) ··· 788 787 789 788 for (i = 0; i < dev->eps_num; i++) { 790 789 ep = &dev->eps[i]; 791 - if (ep->state != STATE_EP_DISABLED) 792 - continue; 793 790 if (ep->addr != usb_endpoint_num(desc) && 794 791 ep->addr != USB_RAW_EP_ADDR_ANY) 795 792 continue; 796 793 if (!usb_gadget_ep_match_desc(dev->gadget, ep->ep, desc, NULL)) 794 + continue; 795 + ep_props_matched = true; 796 + if (ep->state != STATE_EP_DISABLED) 797 797 continue; 798 798 ep->ep->desc = desc; 799 799 ret = usb_ep_enable(ep->ep); ··· 817 815 goto out_unlock; 818 816 } 819 817 820 - dev_dbg(&dev->gadget->dev, "fail, no gadget endpoints available\n"); 821 - ret = -EBUSY; 818 + if (!ep_props_matched) { 819 + dev_dbg(&dev->gadget->dev, "fail, bad endpoint descriptor\n"); 820 + ret = -EINVAL; 821 + } else { 822 + dev_dbg(&dev->gadget->dev, "fail, no endpoints available\n"); 823 + ret = -EBUSY; 824 + } 822 825 823 826 out_free: 824 827 kfree(desc);