Patch "HID: corsair: fix control-transfer error handling" has been added to the 4.4-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
HID: corsair: fix control-transfer error handling
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
hid-corsair-fix-control-transfer-error-handling.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
7a546af50eb78ab99840903083231eb635c8a566Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Thu, 12 Jan 2017 18:17:43 +0100
Subject: HID: corsair: fix control-transfer error handling
From: Johan Hovold <[email protected]>
commit 7a546af50eb78ab99840903083231eb635c8a566 upstream.
Make sure to check for short control transfers in order to avoid parsing uninitialised buffer data and leaking it to user space.
Note that the backlight and macro-mode buffer constraints are kept as loose as possible in order to avoid any regressions should the current buffer sizes be larger than necessary.
--- drivers/hid/hid-corsair.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/hid/hid-corsair.c +3 -3
@@ -159,7 +159,7 @@ static enum led_brightness k90_backlightUSB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 ,0 , data,8 , USB_CTRL_SET_TIMEOUT); -if (ret <0 ) { +if (ret <5 ) {dev_warn (dev,"Failed to get K90 initial state (error %d).\n" , ret); ret = -EIO ;
@@ -274,7 +274,7 @@ static ssize_t k90_show_macro_mode(strucUSB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 ,0 , data,2 , USB_CTRL_SET_TIMEOUT); -if (ret <0 ) { +if (ret <1 ) {dev_warn (dev,"Failed to get K90 initial mode (error %d).\n" , ret); ret = -EIO ;
@@ -351,7 +351,7 @@ static ssize_t k90_show_current_profile(USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 ,0 , data,8 , USB_CTRL_SET_TIMEOUT); -if (ret <0 ) { +if (ret <8 ) {dev_warn (dev,"Failed to get K90 initial state (error %d).\n" , ret); ret = -EIO ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/hid-corsair-fix-dma-buffers-on-stack.patch queue-4.4/hid-corsair-fix-control-transfer-error-handling.patch