From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
To: Benjamin Tissoires <benjamin.tissoires@gmail.com>,
Kees Cook <keescook@chromium.org>,
Henrik Rydberg <rydberg@euromail.se>,
Jiri Kosina <jkosina@suse.cz>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 03/10] HID: sony: validate HID output report details
Date: Wed, 11 Sep 2013 21:56:52 +0200 [thread overview]
Message-ID: <1378929419-6269-4-git-send-email-benjamin.tissoires@redhat.com> (raw)
In-Reply-To: <1378929419-6269-1-git-send-email-benjamin.tissoires@redhat.com>
From: Kees Cook <keescook@chromium.org>
This driver must validate the availability of the HID output report and
its size before it can write LED states via buzz_set_leds(). This stops
a heap overflow that is possible if a device provides a malicious HID
output report:
[ 108.171280] usb 1-1: New USB device found, idVendor=054c, idProduct=0002
...
[ 117.507877] BUG kmalloc-192 (Not tainted): Redzone overwritten
CVE-2013-2890
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
v3:
- no changes
drivers/hid/hid-sony.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 30dbb6b..b18320d 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -537,6 +537,10 @@ static int buzz_init(struct hid_device *hdev)
drv_data = hid_get_drvdata(hdev);
BUG_ON(!(drv_data->quirks & BUZZ_CONTROLLER));
+ /* Validate expected report characteristics. */
+ if (!hid_validate_values(hdev, HID_OUTPUT_REPORT, 0, 0, 7))
+ return -ENODEV;
+
buzz = kzalloc(sizeof(*buzz), GFP_KERNEL);
if (!buzz) {
hid_err(hdev, "Insufficient memory, cannot allocate driver data\n");
--
1.8.3.1
next prev parent reply other threads:[~2013-09-11 19:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-11 19:56 [PATCH v3 00/10] HID: validate report details Benjamin Tissoires
2013-09-11 19:56 ` [PATCH v3 01/10] HID: provide a helper for validating hid reports Benjamin Tissoires
2013-09-11 19:56 ` [PATCH v3 02/10] HID: zeroplus: validate output report details Benjamin Tissoires
2013-09-11 19:56 ` Benjamin Tissoires [this message]
2013-09-12 12:39 ` [PATCH v3 03/10] HID: sony: validate HID " Josh Boyer
2013-09-12 14:11 ` Benjamin Tissoires
2013-09-11 19:56 ` [PATCH v3 04/10] HID: steelseries: validate " Benjamin Tissoires
2013-09-11 19:56 ` [PATCH v3 05/10] HID: LG: validate HID " Benjamin Tissoires
2013-09-11 19:56 ` [PATCH v3 06/10] HID: lenovo-tpkbd: validate " Benjamin Tissoires
2013-09-11 20:06 ` Kees Cook
2013-09-11 20:08 ` Benjamin Tissoires
2013-09-11 19:56 ` [PATCH v3 07/10] HID: logitech-dj: " Benjamin Tissoires
2013-09-11 19:56 ` [PATCH v3 08/10] HID: validate feature and input " Benjamin Tissoires
2013-09-11 20:08 ` Kees Cook
2013-09-11 19:56 ` [PATCH v3 09/10] HID: multitouch: validate indexes details Benjamin Tissoires
2013-09-11 20:09 ` Kees Cook
2013-09-11 19:56 ` [PATCH v3 10/10] HID: lenovo-tpkbd: fix leak if tpkbd_probe_tp fails Benjamin Tissoires
2013-09-11 20:11 ` [PATCH v3 00/10] HID: validate report details Kees Cook
2013-09-13 13:15 ` Jiri Kosina
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1378929419-6269-4-git-send-email-benjamin.tissoires@redhat.com \
--to=benjamin.tissoires@redhat.com \
--cc=benjamin.tissoires@gmail.com \
--cc=jkosina@suse.cz \
--cc=keescook@chromium.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rydberg@euromail.se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).