linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Will McVicker <willmcvicker@google.com>
To: Jiri Kosina <jikos@kernel.org>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>,
	security@kernel.org, linux-input@vger.kernel.org,
	linux-kernel@vger.kernel.org, kernel-team@android.com,
	Will Coster <willcoster@google.com>,
	stable <stable@vger.kernel.org>
Subject: Re: [PATCH v1] HID: make arrays usage and value to be the same
Date: Thu, 17 Dec 2020 10:42:40 -0800	[thread overview]
Message-ID: <CABYd82Z-HJfn1Ts=k7RYrvWCHj=1578--9Y7A0giFn2=RRWcVA@mail.gmail.com> (raw)
In-Reply-To: <nycvar.YFH.7.76.2012171119240.25826@cbobk.fhfr.pm>

Great! Thanks for the reply.

--Will

On Thu, Dec 17, 2020 at 2:19 AM Jiri Kosina <jikos@kernel.org> wrote:
>
> On Mon, 14 Dec 2020, Will McVicker wrote:
>
> > > The HID subsystem allows an "HID report field" to have a different
> > > number of "values" and "usages" when it is allocated. When a field
> > > struct is created, the size of the usage array is guaranteed to be at
> > > least as large as the values array, but it may be larger. This leads to
> > > a potential out-of-bounds write in
> > > __hidinput_change_resolution_multipliers() and an out-of-bounds read in
> > > hidinput_count_leds().
> > >
> > > To fix this, let's make sure that both the usage and value arrays are
> > > the same size.
> > >
> > > Signed-off-by: Will McVicker <willmcvicker@google.com>
> > > ---
> > >  drivers/hid/hid-core.c | 6 +++---
> > >  1 file changed, 3 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> > > index 56172fe6995c..8a8b2b982f83 100644
> > > --- a/drivers/hid/hid-core.c
> > > +++ b/drivers/hid/hid-core.c
> > > @@ -90,7 +90,7 @@ EXPORT_SYMBOL_GPL(hid_register_report);
> > >   * Register a new field for this report.
> > >   */
> > >
> > > -static struct hid_field *hid_register_field(struct hid_report *report, unsigned usages, unsigned values)
> > > +static struct hid_field *hid_register_field(struct hid_report *report, unsigned usages)
> > >  {
> > >     struct hid_field *field;
> > >
> > > @@ -101,7 +101,7 @@ static struct hid_field *hid_register_field(struct hid_report *report, unsigned
> > >
> > >     field = kzalloc((sizeof(struct hid_field) +
> > >                      usages * sizeof(struct hid_usage) +
> > > -                    values * sizeof(unsigned)), GFP_KERNEL);
> > > +                    usages * sizeof(unsigned)), GFP_KERNEL);
> > >     if (!field)
> > >             return NULL;
> > >
> > > @@ -300,7 +300,7 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign
> > >     usages = max_t(unsigned, parser->local.usage_index,
> > >                              parser->global.report_count);
> > >
> > > -   field = hid_register_field(report, usages, parser->global.report_count);
> > > +   field = hid_register_field(report, usages);
> > >     if (!field)
> > >             return 0;
> > >
> > > --
> > > 2.29.2.576.ga3fc446d84-goog
> > >
> >
> > Hi Jiri and Benjamin,
> >
> > This is a friendly reminder in case this got lost in your inbox.
>
> Hi Will,
>
> I am planning to merge it once the merge window is over.
>
> --
> Jiri Kosina
> SUSE Labs
>

  reply	other threads:[~2020-12-17 18:44 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-05  0:48 Will McVicker
2020-12-05  8:59 ` Greg KH
2020-12-07 17:55   ` Will McVicker
2020-12-07 18:24     ` Greg KH
2020-12-07 19:05       ` Will McVicker
2020-12-14 19:15 ` Will McVicker
2020-12-17 10:19   ` Jiri Kosina
2020-12-17 18:42     ` Will McVicker [this message]
2021-01-14 18:19       ` Will McVicker
2021-01-18  8:11 ` Jiri Kosina

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CABYd82Z-HJfn1Ts=k7RYrvWCHj=1578--9Y7A0giFn2=RRWcVA@mail.gmail.com' \
    --to=willmcvicker@google.com \
    --cc=benjamin.tissoires@redhat.com \
    --cc=jikos@kernel.org \
    --cc=kernel-team@android.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=security@kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=willcoster@google.com \
    --subject='Re: [PATCH v1] HID: make arrays usage and value to be the same' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).