mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
HID: ntrig: validate feature report details
commit 875b4e3763
upstream.
A HID device could send a malicious feature report that would cause the
ntrig HID driver to trigger a NULL dereference during initialization:
[57383.031190] usb 3-1: New USB device found, idVendor=1b96, idProduct=0001
...
[57383.315193] BUG: unable to handle kernel NULL pointer dereference at 0000000000000030
[57383.315308] IP: [<ffffffffa08102de>] ntrig_probe+0x25e/0x420 [hid_ntrig]
CVE-2013-2896
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Rafi Rubin <rafi@seas.upenn.edu>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
676bb9a417
commit
2dbe9ce6b7
1 changed files with 2 additions and 1 deletions
|
@ -115,7 +115,8 @@ static inline int ntrig_get_mode(struct hid_device *hdev)
|
|||
struct hid_report *report = hdev->report_enum[HID_FEATURE_REPORT].
|
||||
report_id_hash[0x0d];
|
||||
|
||||
if (!report)
|
||||
if (!report || report->maxfield < 1 ||
|
||||
report->field[0]->report_count < 1)
|
||||
return -EINVAL;
|
||||
|
||||
usbhid_submit_report(hdev, report, USB_DIR_IN);
|
||||
|
|
Loading…
Reference in a new issue