4ab25786c8
There are a few very theoretical off-by-one bugs in report descriptor size checking when performing a pre-parsing fixup. Fix those. Cc: stable@vger.kernel.org Reported-by: Ben Hawkes <hawkes@google.com> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
69 lines
1.9 KiB
C
69 lines
1.9 KiB
C
/*
|
|
* HID driver for some monterey "special" devices
|
|
*
|
|
* Copyright (c) 1999 Andreas Gal
|
|
* Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
|
|
* Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
|
|
* Copyright (c) 2006-2007 Jiri Kosina
|
|
* Copyright (c) 2008 Jiri Slaby
|
|
*/
|
|
|
|
/*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the Free
|
|
* Software Foundation; either version 2 of the License, or (at your option)
|
|
* any later version.
|
|
*/
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/hid.h>
|
|
#include <linux/module.h>
|
|
|
|
#include "hid-ids.h"
|
|
|
|
static __u8 *mr_report_fixup(struct hid_device *hdev, __u8 *rdesc,
|
|
unsigned int *rsize)
|
|
{
|
|
if (*rsize >= 31 && rdesc[29] == 0x05 && rdesc[30] == 0x09) {
|
|
hid_info(hdev, "fixing up button/consumer in HID report descriptor\n");
|
|
rdesc[30] = 0x0c;
|
|
}
|
|
return rdesc;
|
|
}
|
|
|
|
#define mr_map_key_clear(c) hid_map_usage_clear(hi, usage, bit, max, \
|
|
EV_KEY, (c))
|
|
static int mr_input_mapping(struct hid_device *hdev, struct hid_input *hi,
|
|
struct hid_field *field, struct hid_usage *usage,
|
|
unsigned long **bit, int *max)
|
|
{
|
|
if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
|
|
return 0;
|
|
|
|
switch (usage->hid & HID_USAGE) {
|
|
case 0x156: mr_map_key_clear(KEY_WORDPROCESSOR); break;
|
|
case 0x157: mr_map_key_clear(KEY_SPREADSHEET); break;
|
|
case 0x158: mr_map_key_clear(KEY_PRESENTATION); break;
|
|
case 0x15c: mr_map_key_clear(KEY_STOP); break;
|
|
default:
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static const struct hid_device_id mr_devices[] = {
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(hid, mr_devices);
|
|
|
|
static struct hid_driver mr_driver = {
|
|
.name = "monterey",
|
|
.id_table = mr_devices,
|
|
.report_fixup = mr_report_fixup,
|
|
.input_mapping = mr_input_mapping,
|
|
};
|
|
module_hid_driver(mr_driver);
|
|
|
|
MODULE_LICENSE("GPL");
|