Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1429923 > unrolled thread

[PATCH] Validate num_values for HIDIOCGUSAGES, HIDIOCSUSAGES commands.

Back to article view | Back to linux.kernel

Contents

  [PATCH] Validate num_values for HIDIOCGUSAGES, HIDIOCSUSAGES commands. Scott Bauer <sbauer@plzdonthack.me> - 2016-06-23 17:30 +0200
    Re: [PATCH] Validate num_values for HIDIOCGUSAGES, HIDIOCSUSAGES  commands. Jiri Kosina <jikos@kernel.org> - 2016-06-24 10:30 +0200

#1429923 — [PATCH] Validate num_values for HIDIOCGUSAGES, HIDIOCSUSAGES commands.

This patch validates the num_values parameter from userland during
the HIDIOCGUSAGES and HIDIOCSUSAGES commands. Previously, if the
report id was set to HID_REPORT_ID_UNKNOWN, we would fail to
validate the num_values parameter leading to a heap overflow.

Signed-off-by: Scott Bauer <sbauer@plzdonthack.me>
---
 drivers/hid/usbhid/hiddev.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 2f1ddca..700145b 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -516,13 +516,13 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd,
 					goto inval;
 			} else if (uref->usage_index >= field->report_count)
 				goto inval;
-
-			else if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) &&
-				 (uref_multi->num_values > HID_MAX_MULTI_USAGES ||
-				  uref->usage_index + uref_multi->num_values > field->report_count))
-				goto inval;
 		}
 
+		if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) &&
+		    (uref_multi->num_values > HID_MAX_MULTI_USAGES ||
+		     uref->usage_index + uref_multi->num_values > field->report_count))
+			goto inval;
+
 		switch (cmd) {
 		case HIDIOCGUSAGE:
 			uref->value = field->value[uref->usage_index];
-- 
1.9.1

[toc] | [next] | [standalone]

#1430455 — Re: [PATCH] Validate num_values for HIDIOCGUSAGES, HIDIOCSUSAGES commands.

On Thu, 23 Jun 2016, Scott Bauer wrote:

> This patch validates the num_values parameter from userland during
> the HIDIOCGUSAGES and HIDIOCSUSAGES commands. Previously, if the
> report id was set to HID_REPORT_ID_UNKNOWN, we would fail to
> validate the num_values parameter leading to a heap overflow.

Thanks for the fix. I've added Cc: stable, applied it to 
for-4.7/upstream-fixes branch, and will be including it in a pull request 
to Linus shortly.

-- 
Jiri Kosina
SUSE Labs

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web