MIME-Version: 1.0
References: <20230313154522.52684-1-andriy.shevchenko@linux.intel.com>
In-Reply-To: <20230313154522.52684-1-andriy.shevchenko@linux.intel.com>
From:   =?UTF-8?B?SsOzIMOBZ2lsYSBCaXRzY2g=?= <jgilab@gmail.com>
Date:   Thu, 16 Mar 2023 11:36:41 +0100
Message-ID: <CAMUOyH1BFnGzODgCZP+Whde=Kbmq_5rPN02GrfSp8z2_PVPpEQ@mail.gmail.com>
Subject: Re: [PATCH v1 1/1] usb: gadget: Use correct endianness of the wLength
 field for WebUSB
To:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Mar 13, 2023 at 4:44=E2=80=AFPM Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> WebUSB code uses wLength directly without proper endianness conversion.
> Update it to use already prepared temporary variable w_length instead.

Excellent catch! Thank you very much for finding this. This could have
been a very hard to find issue in a big endian system.

I tested this on my local setup and it (unsurprisingly) works like a charm.

> Fixes: 93c473948c58 ("usb: gadget: add WebUSB landing page support")
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-By: J=C3=B3 =C3=81gila Bitsch <jgilab@gmail.com>

> ---
>  drivers/usb/gadget/composite.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composit=
e.c
> index fa7dd6cf014d..5377d873c08e 100644
> --- a/drivers/usb/gadget/composite.c
> +++ b/drivers/usb/gadget/composite.c
> @@ -2079,10 +2079,9 @@ composite_setup(struct usb_gadget *gadget, const s=
truct usb_ctrlrequest *ctrl)
>                                 sizeof(url_descriptor->URL)
>                                 - WEBUSB_URL_DESCRIPTOR_HEADER_LENGTH + l=
anding_page_offset);
>
> -                       if (ctrl->wLength < WEBUSB_URL_DESCRIPTOR_HEADER_=
LENGTH
> -                                           + landing_page_length)
> -                               landing_page_length =3D ctrl->wLength
> -                                       - WEBUSB_URL_DESCRIPTOR_HEADER_LE=
NGTH + landing_page_offset;
> +                       if (w_length < WEBUSB_URL_DESCRIPTOR_HEADER_LENGT=
H + landing_page_length)
> +                               landing_page_length =3D w_length
> +                               - WEBUSB_URL_DESCRIPTOR_HEADER_LENGTH + l=
anding_page_offset;
>
>                         memcpy(url_descriptor->URL,
>                                 cdev->landing_page + landing_page_offset,
> --
> 2.39.2
>