Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220308112832.6170-1-jj251510319013@gmail.com>
In-Reply-To: <20220308112832.6170-1-jj251510319013@gmail.com>
From:   Andrey Konovalov <andreyknvl@gmail.com>
Date:   Thu, 10 Mar 2022 00:59:29 +0100
Message-ID: <CA+fCnZd2GoU6LVvT4eBT3w7TigRrp_9XcAGyL55K5nbi3yt4sA@mail.gmail.com>
Subject: Re: [PATCH] usb: gadget: return -EINVAL if no proper ep address available
To:     Wei Ming Chen <jj251510319013@gmail.com>
Cc:     LKML <linux-kernel@vger.kernel.org>,
        Felipe Balbi <balbi@kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        USB list <linux-usb@vger.kernel.org>
Content-Type: multipart/mixed; boundary="00000000000014bb2505d9d1e4ac"
Precedence: bulk

--00000000000014bb2505d9d1e4ac
Content-Type: text/plain; charset="UTF-8"

On Tue, Mar 8, 2022 at 12:31 PM Wei Ming Chen <jj251510319013@gmail.com> wrote:
>

Hi,

The commit name should be prefixed with "usb: raw-gadget:".

> 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, Cuz -EBUSY sounds
> like ep5in is not available now, but might be available in the future.

Cuz -> because

>
> Signed-off-by: Wei Ming Chen <jj251510319013@gmail.com>
> ---
>  drivers/usb/gadget/legacy/raw_gadget.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/drivers/usb/gadget/legacy/raw_gadget.c b/drivers/usb/gadget/legacy/raw_gadget.c
> index d86c3a36441e..b4cc083a7ca6 100644
> --- a/drivers/usb/gadget/legacy/raw_gadget.c
> +++ b/drivers/usb/gadget/legacy/raw_gadget.c
> @@ -758,6 +758,7 @@ static int raw_ioctl_ep_enable(struct raw_dev *dev, unsigned long value)
>         unsigned long flags;
>         struct usb_endpoint_descriptor *desc;
>         struct raw_ep *ep;
> +       bool ep_num_matched = false;
>
>         desc = memdup_user((void __user *)value, sizeof(*desc));
>         if (IS_ERR(desc))
> @@ -792,6 +793,7 @@ static int raw_ioctl_ep_enable(struct raw_dev *dev, unsigned long value)
>                 if (ep->addr != usb_endpoint_num(desc) &&
>                                 ep->addr != USB_RAW_EP_ADDR_ANY)
>                         continue;
> +               ep_num_matched = true;
>                 if (!usb_gadget_ep_match_desc(dev->gadget, ep->ep, desc, NULL))
>                         continue;
>                 ep->ep->desc = desc;
> @@ -815,6 +817,12 @@ static int raw_ioctl_ep_enable(struct raw_dev *dev, unsigned long value)
>                 goto out_unlock;
>         }
>
> +       if (!ep_num_matched) {
> +               dev_dbg(&dev->gadget->dev, "fail, no proper ep address available\n");
> +               ret = -EINVAL;
> +               goto out_free;
> +       }

Thinking more about this, we should cover the following cases:

1. If there are no endpoints that match the provided descriptor, return EINVAL.

2. If there are matching endpoints, but they are all already enabled,
return EBUSY.

A draft change is attached.

What do you think?

If the suggested change looks good, feel free to incorporate it into
the version 2 of your patch.

> +
>         dev_dbg(&dev->gadget->dev, "fail, no gadget endpoints available\n");
>         ret = -EBUSY;
>
> --
> 2.25.1
>

Thanks!

--00000000000014bb2505d9d1e4ac
Content-Type: text/x-patch; charset="US-ASCII"; name="raw-gadget-retval.patch"
Content-Disposition: attachment; filename="raw-gadget-retval.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_l0k813tg0>
X-Attachment-Id: f_l0k813tg0

ZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL2dhZGdldC9sZWdhY3kvcmF3X2dhZGdldC5jIGIvZHJp
dmVycy91c2IvZ2FkZ2V0L2xlZ2FjeS9yYXdfZ2FkZ2V0LmMKaW5kZXggZDg2YzNhMzY0NDFlLi5h
MGQ1ZWRmMWIyYzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL2dhZGdldC9sZWdhY3kvcmF3X2dh
ZGdldC5jCisrKyBiL2RyaXZlcnMvdXNiL2dhZGdldC9sZWdhY3kvcmF3X2dhZGdldC5jCkBAIC03
ODcsMTMgKzc4NywxNCBAQCBzdGF0aWMgaW50IHJhd19pb2N0bF9lcF9lbmFibGUoc3RydWN0IHJh
d19kZXYgKmRldiwgdW5zaWduZWQgbG9uZyB2YWx1ZSkKIAogCWZvciAoaSA9IDA7IGkgPCBkZXYt
PmVwc19udW07IGkrKykgewogCQllcCA9ICZkZXYtPmVwc1tpXTsKLQkJaWYgKGVwLT5zdGF0ZSAh
PSBTVEFURV9FUF9ESVNBQkxFRCkKLQkJCWNvbnRpbnVlOwogCQlpZiAoZXAtPmFkZHIgIT0gdXNi
X2VuZHBvaW50X251bShkZXNjKSAmJgogCQkJCWVwLT5hZGRyICE9IFVTQl9SQVdfRVBfQUREUl9B
TlkpCiAJCQljb250aW51ZTsKIAkJaWYgKCF1c2JfZ2FkZ2V0X2VwX21hdGNoX2Rlc2MoZGV2LT5n
YWRnZXQsIGVwLT5lcCwgZGVzYywgTlVMTCkpCiAJCQljb250aW51ZTsKKwkJZXBfcHJvcHNfbWF0
Y2hlZCA9IHRydWU7CisJCWlmIChlcC0+c3RhdGUgIT0gU1RBVEVfRVBfRElTQUJMRUQpCisJCQlj
b250aW51ZTsKIAkJZXAtPmVwLT5kZXNjID0gZGVzYzsKIAkJcmV0ID0gdXNiX2VwX2VuYWJsZShl
cC0+ZXApOwogCQlpZiAocmV0IDwgMCkgewpAQCAtODE1LDggKzgxNiwxMyBAQCBzdGF0aWMgaW50
IHJhd19pb2N0bF9lcF9lbmFibGUoc3RydWN0IHJhd19kZXYgKmRldiwgdW5zaWduZWQgbG9uZyB2
YWx1ZSkKIAkJZ290byBvdXRfdW5sb2NrOwogCX0KIAotCWRldl9kYmcoJmRldi0+Z2FkZ2V0LT5k
ZXYsICJmYWlsLCBubyBnYWRnZXQgZW5kcG9pbnRzIGF2YWlsYWJsZVxuIik7Ci0JcmV0ID0gLUVC
VVNZOworCWlmICghZXBfcHJvcHNfbWF0Y2hlZCkKKwkJZGV2X2RiZygmZGV2LT5nYWRnZXQtPmRl
diwgImZhaWwsIGJhZCBlbmRwb2ludCBkZXNjcmlwdG9yXG4iKTsKKwkJcmV0ID0gLUVJTlZBTDsK
Kwl9IGVsc2UgeworCQlkZXZfZGJnKCZkZXYtPmdhZGdldC0+ZGV2LCAiZmFpbCwgbm8gZW5kcG9p
bnRzIGF2YWlsYWJsZVxuIik7CisJCXJldCA9IC1FQlVTWTsKKwl9CiAKIG91dF9mcmVlOgogCWtm
cmVlKGRlc2MpOwo=
--00000000000014bb2505d9d1e4ac--