From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752562AbbBWOLA (ORCPT ); Mon, 23 Feb 2015 09:11:00 -0500 Received: from cantor2.suse.de ([195.135.220.15]:59964 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752531AbbBWOK5 (ORCPT ); Mon, 23 Feb 2015 09:10:57 -0500 Date: Mon, 23 Feb 2015 15:10:55 +0100 (CET) From: Jiri Kosina To: Seth Forshee cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Benjamin Tissoires Subject: Re: [PATCH] HID: i2c-hid: Limit reads to wMaxInputLength bytes for input events In-Reply-To: <1424454311-70750-1-git-send-email-seth.forshee@canonical.com> Message-ID: References: <1424454311-70750-1-git-send-email-seth.forshee@canonical.com> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 20 Feb 2015, Seth Forshee 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" > Cc: Benjamin Tissoires > Signed-off-by: Seth Forshee > --- > drivers/hid/i2c-hid/i2c-hid.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Applied, thanks. > 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) { -- Jiri Kosina SUSE Labs