MIME-Version: 1.0
References: <20220105040439.3182-1-jj251510319013@gmail.com> <Ydb+L+wXfKzXyma9@kroah.com>
In-Reply-To: <Ydb+L+wXfKzXyma9@kroah.com>
From:   =?UTF-8?B?6Zmz5YGJ6YqY?= <jj251510319013@gmail.com>
Date:   Fri, 7 Jan 2022 10:37:19 +0800
Message-ID: <CAJwFiG+caDOp48R+EMATi9W_hCt-SBoEeeeEK8XGuRWai=bYug@mail.gmail.com>
Subject: Re: [PATCH] usb: gadget: function: Fix returning incorrect PNP string
To:     Greg KH <gregkh@linuxfoundation.org>
Cc:     linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
        balbi@kernel.org,
        =?UTF-8?Q?Maciej_=C5=BBenczykowski?= <maze@google.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Greg KH <gregkh@linuxfoundation.org> =E6=96=BC 2022=E5=B9=B41=E6=9C=886=E6=
=97=A5 =E9=80=B1=E5=9B=9B =E4=B8=8B=E5=8D=8810:35=E5=AF=AB=E9=81=93=EF=BC=
=9A
>
> On Wed, Jan 05, 2022 at 12:04:39PM +0800, Wei Ming Chen wrote:
> > There will be 2 leading bytes indicating the total length of
> > the PNP string, so I think we should add value by 2, otherwise
> > the PNP string copied to user will not contain the last 2 bytes
> >
> > Signed-off-by: Wei Ming Chen <jj251510319013@gmail.com>
> > ---
> >  drivers/usb/gadget/function/f_printer.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/usb/gadget/function/f_printer.c b/drivers/usb/gadg=
et/function/f_printer.c
> > index abec5c58f525..3fb00fd0b5ee 100644
> > --- a/drivers/usb/gadget/function/f_printer.c
> > +++ b/drivers/usb/gadget/function/f_printer.c
> > @@ -1005,9 +1005,11 @@ static int printer_func_setup(struct usb_functio=
n *f,
> >                               break;
> >                       }
> >                       value =3D strlen(dev->pnp_string);
> > +                     memcpy(buf + 2, dev->pnp_string, value);
> > +
> > +                     value +=3D 2;
> >                       buf[0] =3D (value >> 8) & 0xFF;
> >                       buf[1] =3D value & 0xFF;
> > -                     memcpy(buf + 2, dev->pnp_string, value);
> >                       DBG(dev, "1284 PNP String: %x %s\n", value,
> >                           dev->pnp_string);
> >                       break;
> > --
> > 2.25.1
> >
>
> Are you sure this is correct?
>
> How is this related to this recent thread:
>         https://lore.kernel.org/all/CAKjGFBUdjXcZoVV4jdrgTz4rKThTfZAK4Cqr=
eKmBZ4KHE+K1GA@mail.gmail.com/#t
>
> your change is different from what is proposed there, why?

I didn=E2=80=99t notice this thread before I send this patch, I think the
concept of my change is similar to Volodymyr Lisivka=E2=80=99s change, he/s=
he
introduced a separate variable for the PNP string length, I think it
may be clearer and more readable than just =E2=80=9Cvalue +=3D 2=E2=80=9D


Another thing that I am not too sure whether I am correct is this line of c=
ode

DBG(dev, "1284 PNP String: %x %s\n", value,
                             dev->pnp_string);

What Volodymyr Lisivka changed is like this

DBG(dev, "1284 PNP String: %x %s\n", pnp_length,
                             dev->pnp_string);

In my change, =E2=80=9Cvalue=E2=80=9D equals to =E2=80=9Cpnp_length + 2=E2=
=80=9D in Volodymyr
Lisivka=E2=80=99s change, and I think we should print =E2=80=9Cthe PNP stri=
ng length +
2=E2=80=9D instead of =E2=80=9Cthe PNP string length=E2=80=9D?


>
> thanks,
>
> greg k-h

thanks,

Wei Ming Chen