APPLIED: [PATCH][vivid/unstable] HID: i2c-hid: Limit reads to wMaxInputLength bytes for input events

[Leann Ogasawara]

This has made it's way into Linus' tree so I've cherry-picked it from there
and pushed to Vivid unstable.

Thanks,
Leann

On Mon, Feb 23, 2015 at 1:17 PM, Seth Forshee <seth.forshee at canonical.com>
wrote:

> d1c7e29e8d27 (HID: i2c-hid: prevent buffer overflow in early IRQ)
> changed hid_get_input() to read ihid->bufsize bytes, which can be
> more than wMaxInputLength. This is the case with the Dell XPS 13
> 9343, and it is causing events to be missed. In some cases the
> missed events are releases, which can cause the cursor to jump or
> freeze, among other problems. Limit the number of bytes read to
> min(wMaxInputLength, ihid->bufsize) to prevent such problems.
>
> Fixes: d1c7e29e8d27 "HID: i2c-hid: prevent buffer overflow in early IRQ"
> Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
> Reviewed-by: Benjamin Tissoires <benjamin.tissoires at redhat.com>
> Signed-off-by: Jiri Kosina <jkosina at suse.cz>
> (cherry picked from commit 6d00f37e49d95e640a3937a4a1ae07dbe92a10cb
>  git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git)
> ---
>
> This should come in from upstream stable eventually, but for selfish
> reasons I'd like to get it in sooner. I'm targeting 3.19 since I'm not
> anticipating any more 3.18 releases for vivid, but it should apply fine
> to 3.18 as well.
>
>  drivers/hid/i2c-hid/i2c-hid.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
> index d43e967..5e72fc2 100644
> --- a/drivers/hid/i2c-hid/i2c-hid.c
> +++ b/drivers/hid/i2c-hid/i2c-hid.c
> @@ -370,7 +370,10 @@ static int i2c_hid_hwreset(struct i2c_client *client)
>  static void i2c_hid_get_input(struct i2c_hid *ihid)
>  {
>         int ret, ret_size;
> -       int size = ihid->bufsize;
> +       int size = le16_to_cpu(ihid->hdesc.wMaxInputLength);
> +
> +       if (size > ihid->bufsize)
> +               size = ihid->bufsize;
>
>         ret = i2c_master_recv(ihid->client, ihid->inbuf, size);
>         if (ret != size) {
> --
> 1.9.1
>
>
> --
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20150226/f90145e1/attachment.html>