Commit 75c60df1 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

HID: corsair: fix control-transfer error handling

commit 7a546af5 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.

Fixes: 6f78193e ("HID: corsair: Add Corsair Vengeance K90 driver")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0f37d20f
...@@ -159,7 +159,7 @@ static enum led_brightness k90_backlight_get(struct led_classdev *led_cdev) ...@@ -159,7 +159,7 @@ static enum led_brightness k90_backlight_get(struct led_classdev *led_cdev)
USB_DIR_IN | USB_TYPE_VENDOR | USB_DIR_IN | USB_TYPE_VENDOR |
USB_RECIP_DEVICE, 0, 0, data, 8, USB_RECIP_DEVICE, 0, 0, data, 8,
USB_CTRL_SET_TIMEOUT); USB_CTRL_SET_TIMEOUT);
if (ret < 0) { if (ret < 5) {
dev_warn(dev, "Failed to get K90 initial state (error %d).\n", dev_warn(dev, "Failed to get K90 initial state (error %d).\n",
ret); ret);
ret = -EIO; ret = -EIO;
...@@ -274,7 +274,7 @@ static ssize_t k90_show_macro_mode(struct device *dev, ...@@ -274,7 +274,7 @@ static ssize_t k90_show_macro_mode(struct device *dev,
USB_DIR_IN | USB_TYPE_VENDOR | USB_DIR_IN | USB_TYPE_VENDOR |
USB_RECIP_DEVICE, 0, 0, data, 2, USB_RECIP_DEVICE, 0, 0, data, 2,
USB_CTRL_SET_TIMEOUT); USB_CTRL_SET_TIMEOUT);
if (ret < 0) { if (ret < 1) {
dev_warn(dev, "Failed to get K90 initial mode (error %d).\n", dev_warn(dev, "Failed to get K90 initial mode (error %d).\n",
ret); ret);
ret = -EIO; ret = -EIO;
...@@ -351,7 +351,7 @@ static ssize_t k90_show_current_profile(struct device *dev, ...@@ -351,7 +351,7 @@ static ssize_t k90_show_current_profile(struct device *dev,
USB_DIR_IN | USB_TYPE_VENDOR | USB_DIR_IN | USB_TYPE_VENDOR |
USB_RECIP_DEVICE, 0, 0, data, 8, USB_RECIP_DEVICE, 0, 0, data, 8,
USB_CTRL_SET_TIMEOUT); USB_CTRL_SET_TIMEOUT);
if (ret < 0) { if (ret < 8) {
dev_warn(dev, "Failed to get K90 initial state (error %d).\n", dev_warn(dev, "Failed to get K90 initial state (error %d).\n",
ret); ret);
ret = -EIO; ret = -EIO;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment