From patchwork Mon Apr 26 22:34:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Ott X-Patchwork-Id: 95237 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3QN6qvk022228 for ; Mon, 26 Apr 2010 23:06:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753344Ab0DZXGv (ORCPT ); Mon, 26 Apr 2010 19:06:51 -0400 Received: from core.signal11.us ([64.251.29.136]:36538 "EHLO core.signal11.us" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753031Ab0DZXGu (ORCPT ); Mon, 26 Apr 2010 19:06:50 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 26 Apr 2010 23:06:52 +0000 (UTC) X-Greylist: delayed 1922 seconds by postgrey-1.27 at vger.kernel.org; Mon, 26 Apr 2010 19:06:50 EDT Received: from localhost (localhost.localdomain [127.0.0.1]) by core.signal11.us (Postfix) with SMTP id E4E011042FC for ; Mon, 26 Apr 2010 18:34:47 -0400 (EDT) Received: from [192.168.1.200] (c-76-26-176-48.hsd1.fl.comcast.net [76.26.176.48]) by core.signal11.us (Postfix) with ESMTP id 82DE71042FA; Mon, 26 Apr 2010 18:34:46 -0400 (EDT) Message-ID: <4BD61506.1030301@signal11.us> Date: Mon, 26 Apr 2010 18:34:46 -0400 From: Alan Ott User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Jiri Kosina , Stephane Chatty , Marcel Holtmann , simon.windows@gmail.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/1] Bug in hidraw When a HID Device Contains Multiple Reports X-Enigmail-Version: 0.95.0 X-DSPAM-Result: Innocent X-DSPAM-Processed: Mon Apr 26 18:34:47 2010 X-DSPAM-Confidence: 1.0000 X-DSPAM-Probability: 0.0023 X-DSPAM-Signature: 4bd6150785295881673135 X-DSPAM-Factors: 27, contains, 0.40000, reports, 0.40000, reports, 0.40000, reports+Signed, 0.40000, report+number, 0.40000, report+number, 0.40000, >transfer_buffer+to, 0.40000, void, 0.40000, Date*Apr, 0.40000, data+bytes), 0.40000, urb, 0.40000, urb, 0.40000, an+extra, 0.40000, an+extra, 0.40000, Date*46+0400, 0.40000, To*linux+input, 0.40000, HID_CLAIMED_HIDRAW)+hidraw_report_event(hid, 0.40000, an, 0.40000, an, 0.40000, a+<, 0.40000, >numbered), 0.40000, >numbered), 0.40000, up+Nothing, 0.40000, can+send, 0.40000, IN+transfer, 0.40000, from, 0.40000, from, 0.40000 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 2e2aa75..0e4a6fb 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1043,13 +1043,8 @@ void hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size, if ((hid->claimed & HID_CLAIMED_HIDDEV) && hid->hiddev_report_event) hid->hiddev_report_event(hid, report); - if (hid->claimed & HID_CLAIMED_HIDRAW) { - /* numbered reports need to be passed with the report num */ - if (report_enum->numbered) - hidraw_report_event(hid, data - 1, size + 1); - else - hidraw_report_event(hid, data, size); - } + if (hid->claimed & HID_CLAIMED_HIDRAW) + hidraw_report_event(hid, data, size); for (a = 0; a < report->maxfield; a++) hid_input_field(hid, report->field[a], cdata, interrupt);