On Wed, Oct 25, 2017 at 12:33:38PM +0200, Andrey Konovalov wrote:
> On Tue, Oct 24, 2017 at 6:39 PM, Dmitry Torokhov
> <dmitry.torokhov@xxxxxxxxx> wrote:
> > On Tue, Oct 24, 2017 at 01:04:03PM +0200, Andrey Konovalov wrote:
> >> On Tue, Oct 24, 2017 at 7:28 AM, Dmitry Torokhov
> >> <dmitry.torokhov@xxxxxxxxx> wrote:
> >> > parse_hid_report_descriptor() has a while (i < length) loop, which
> >> > only guarantees that there's at least 1 byte in the buffer, but the
> >> > loop body can read multiple bytes which causes out-of-bounds access.
> >> >
> >> > Reported-by: Andrey Konovalov <andreyknvl@xxxxxxxxxx>
> >> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
> >> > ---
> >> > drivers/input/tablet/gtco.c | 24 +++++++++++++++++-------
> >> > 1 file changed, 17 insertions(+), 7 deletions(-)
> >> >
> >> > diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c
> >> > index b796e891e2ee..0351203b8c24 100644
> >> > --- a/drivers/input/tablet/gtco.c
> >> > +++ b/drivers/input/tablet/gtco.c
> >> > @@ -230,13 +230,24 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report,
> >> >
> >> > /* Walk this report and pull out the info we need */
> >> > while (i < length) {
> >> > - prefix = report[i];
> >> > -
> >> > - /* Skip over prefix */
> >> > - i++;
> >> > + prefix = report[i++];
> >> >
> >> > /* Determine data size and save the data in the proper variable */
> >> > - size = PREF_SIZE(prefix);
> >> > + if (PREF_SIZE(prefix) < 1) {
> >>
> >> AFAIU PREF_SIZE(prefix) == 0 is a perfectly valid item data size.
> >
> > Fair enough. How about the below instead then?
> >
> > --
> > Dmitry
> >
> >
> > Input: gtco - fix potential out-of-bound access
> >
> > From: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
> >
> > parse_hid_report_descriptor() has a while (i < length) loop, which
> > only guarantees that there's at least 1 byte in the buffer, but the
> > loop body can read multiple bytes which causes out-of-bounds access.
> >
> > Reported-by: Andrey Konovalov <andreyknvl@xxxxxxxxxx>
> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
> > ---
> > drivers/input/tablet/gtco.c | 17 ++++++++++-------
> > 1 file changed, 10 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c
> > index b796e891e2ee..7d8e9fb831c4 100644
> > --- a/drivers/input/tablet/gtco.c
> > +++ b/drivers/input/tablet/gtco.c
> > @@ -230,13 +230,17 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report,
> >
> > /* Walk this report and pull out the info we need */
> > while (i < length) {
> > - prefix = report[i];
> > -
> > - /* Skip over prefix */
> > - i++;
> > + prefix = report[i++];
> >
> > /* Determine data size and save the data in the proper variable */
> > - size = PREF_SIZE(prefix);
> > + size = (1U << PREF_SIZE(prefix)) >> 1;
> > + if (size && i + size >= length) {
>
> I think this should be >, not >=, as when i + size == length, item
> data fits into the remaining space precisely. Also I don't see much
> point in checking that size is not 0, but I don't mind it.
Yes, you are right, I ma not sure why I thought that condition should be
greater or equal, not simply greater. I'll adjust this and drop the size
!= 0 check as it is definitely not needed with the updated condition.
I'll put you down as reviewed-by.
Thanks!
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
