MIME-Version: 1.0
In-Reply-To: <1457552370-29404-1-git-send-email-eu@felipetonello.com>
References: <1457552370-29404-1-git-send-email-eu@felipetonello.com>
Date: Wed, 9 Mar 2016 14:43:06 -0800
Message-ID: <CAJJ6jxss_ugwktn+U6O7hEXuW2tCfspR=oz2LOj6fHCrAyN9Vw@mail.gmail.com>
Subject: Re: [PATCH] usb: gadget: f_midi: Fixed a bug when buflen was smaller
 than wMaxPacketSize
From: Steve Calfee <stevecalfee@gmail.com>
To: "Felipe F. Tonello" <eu@felipetonello.com>
Cc: USB list <linux-usb@vger.kernel.org>,
        Kernel development list <linux-kernel@vger.kernel.org>,
        Felipe Balbi <balbi@kernel.org>, Michal Nazarewicz <mina86@mina86.com>,
        Robert Baldyga <r.baldyga@samsung.com>
Content-Type: text/plain; charset=UTF-8
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1737
Lines: 44

On Wed, Mar 9, 2016 at 11:39 AM, Felipe F. Tonello <eu@felipetonello.com> wrote:
> buflen by default (256) is smaller than wMaxPacketSize (512) in high-speed
> devices.
>
> That caused the OUT endpoint to freeze if the host send any data packet of
> length greater than 256 bytes.
>
> This is an example dump of what happended on that enpoint:
> HOST:   [DATA][Length=260][...]
> DEVICE: [NAK]
> HOST:   [PING]
> DEVICE: [NAK]
> HOST:   [PING]
> DEVICE: [NAK]
> ...
> HOST:   [PING]
> DEVICE: [NAK]
>
> This patch fixes this problem by setting the minimum usb_request's buffer size
> for the OUT endpoint as its wMaxPacketSize.
>
> Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
> ---
>  drivers/usb/gadget/function/f_midi.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
> index 8475e3dc82d4..826ba641f29d 100644
> --- a/drivers/usb/gadget/function/f_midi.c
> +++ b/drivers/usb/gadget/function/f_midi.c
> @@ -366,7 +366,9 @@ static int f_midi_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
>         /* allocate a bunch of read buffers and queue them all at once. */
>         for (i = 0; i < midi->qlen && err == 0; i++) {
>                 struct usb_request *req =
> -                       midi_alloc_ep_req(midi->out_ep, midi->buflen);
> +                       midi_alloc_ep_req(midi->out_ep,
> +                               max_t(unsigned, midi->buflen,
> +                                       bulk_out_desc.wMaxPacketSize));
>                 if (req == NULL)
>                         return -ENOMEM;
>
Won't you get a buffer overrun if midi->buflen is less than wMaxPacketSize?

Regards, Steve