Skip to contentSkip to conversation

HID: roccat: potential out of bounds in pyra_sysfs_write_settings()

PATCH Applied Dan Carpenter 2 participants 2 messages Jan 9, 2015

Subsystems (3)
Kernel janitors HID Roccat drivers
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 HID: roccat: potential out of bounds in pyra_sysfs_write_settings()

This is a static checker fix. We write some binary settings to the sysfs file. One of the settings is the "->startup_profile". There isn't any checking to make sure it fits into the pyra->profile_settings[] array in the profile_activated() function.

I added a check to pyra_sysfs_write_settings() in both places because I wasn't positive that the other callers were correct.

Signed-off-by Dan Carpenter <[email protected]>
drivers/hid/hid-roccat-pyra.c +6 -2
index 1a07e07..47d7e74 100644
@@ -35,6 +35,8 @@ static struct class *pyra_class;
 static void profile_activated(struct pyra_device *pyra,
 		unsigned int new_profile)
 {
+	if (new_profile >= ARRAY_SIZE(pyra->profile_settings))
+		return;
 	pyra->actual_profile = new_profile;
 	pyra->actual_cpi = pyra->profile_settings[pyra->actual_profile].y_cpi;
 }

@@ -257,9 +259,11 @@ static ssize_t pyra_sysfs_write_settings(struct file *fp,
 	if (off != 0 || count != PYRA_SIZE_SETTINGS)
 		return -EINVAL;
 
-	mutex_lock(&pyra->pyra_lock);
-
 	settings = (struct pyra_settings const *)buf;
+	if (settings->startup_profile >= ARRAY_SIZE(pyra->profile_settings))
+		return -EINVAL;
+
+	mutex_lock(&pyra->pyra_lock);
 
 	retval = pyra_set_settings(usb_dev, settings);
 	if (retval) {
Applied
#1 lore raw
Quoted 9 lines · Dan Carpenter

This is a static checker fix. We write some binary settings to the sysfs file. One of the settings is the "->startup_profile". There isn't any checking to make sure it fits into the pyra->profile_settings[] array in the profile_activated() function.

I added a check to pyra_sysfs_write_settings() in both places because I wasn't positive that the other callers were correct.

Signed-off-by Dan Carpenter <[email protected]>

Applied to hid.git#for-3.19/upstream-fixes. Thanks,

Signature · 2 lines
Jiri Kosina
SUSE Labs