| From: Kees Cook <keescook@chromium.org> |
| Date: Wed, 11 Sep 2013 21:56:56 +0200 |
| Subject: HID: logitech-dj: validate output report details |
| |
| commit 297502abb32e225fb23801fcdb0e4f6f8e17099a upstream. |
| |
| A HID device could send a malicious output report that would cause the |
| logitech-dj HID driver to leak kernel memory contents to the device, or |
| trigger a NULL dereference during initialization: |
| |
| [ 304.424553] usb 1-1: New USB device found, idVendor=046d, idProduct=c52b |
| ... |
| [ 304.780467] BUG: unable to handle kernel NULL pointer dereference at 0000000000000028 |
| [ 304.781409] IP: [<ffffffff815d50aa>] logi_dj_recv_send_report.isra.11+0x1a/0x90 |
| |
| CVE-2013-2895 |
| |
| Signed-off-by: Kees Cook <keescook@chromium.org> |
| Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| [bwh: Backported to 3.2: drop inapplicable changes to |
| logi_dj_recv_send_report()] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/hid/hid-logitech-dj.c | 10 ++++++++-- |
| 1 file changed, 8 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/hid/hid-logitech-dj.c |
| +++ b/drivers/hid/hid-logitech-dj.c |
| @@ -791,6 +791,12 @@ static int logi_dj_probe(struct hid_devi |
| goto hid_parse_fail; |
| } |
| |
| + if (!hid_validate_values(hdev, HID_OUTPUT_REPORT, REPORT_ID_DJ_SHORT, |
| + 0, DJREPORT_SHORT_LENGTH - 1)) { |
| + retval = -ENODEV; |
| + goto hid_parse_fail; |
| + } |
| + |
| /* Starts the usb device and connects to upper interfaces hiddev and |
| * hidraw */ |
| retval = hid_hw_start(hdev, HID_CONNECT_DEFAULT); |
