diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2014-08-21 09:56:47 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-08-21 10:38:13 -0500 |
| commit | 51217e69697fba92a06e07e16f55c9a52d8e8945 (patch) | |
| tree | 285dfb9a05585d0e7f767c618e1cc8f9e73ce8c6 /drivers/hid/hid-logitech-dj.c | |
| parent | HID: logitech: Prevent possibility of infinite loop when using /sys interface (diff) | |
| download | linux-dev-51217e69697fba92a06e07e16f55c9a52d8e8945.tar.xz linux-dev-51217e69697fba92a06e07e16f55c9a52d8e8945.zip | |
HID: logitech: fix bounds checking on LED report size
The check on report size for REPORT_TYPE_LEDS in logi_dj_ll_raw_request()
is wrong; the current check doesn't make any sense -- the report allocated
by HID core in hid_hw_raw_request() can be much larger than
DJREPORT_SHORT_LENGTH, and currently logi_dj_ll_raw_request() doesn't
handle this properly at all.
Fix the check by actually trimming down the report size properly if it is
too large.
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>
Diffstat (limited to 'drivers/hid/hid-logitech-dj.c')
| -rw-r--r-- | drivers/hid/hid-logitech-dj.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c index 486dbde2ba2d..ca0ab5112efd 100644 --- a/drivers/hid/hid-logitech-dj.c +++ b/drivers/hid/hid-logitech-dj.c @@ -557,7 +557,7 @@ static int logi_dj_ll_raw_request(struct hid_device *hid, if (!out_buf) return -ENOMEM; - if (count < DJREPORT_SHORT_LENGTH - 2) + if (count > DJREPORT_SHORT_LENGTH - 2) count = DJREPORT_SHORT_LENGTH - 2; out_buf[0] = REPORT_ID_DJ_SHORT; |