Commit 12594362 authored by Dan Carpenter's avatar Dan Carpenter Committed by Zefan Li

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

commit 606185b2 upstream.

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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
[lizf: Backported to 3.4: define the variable @settings]
Signed-off-by: default avatarZefan Li <lizefan@huawei.com>
parent 7f1be7c6
...@@ -35,6 +35,8 @@ static struct class *pyra_class; ...@@ -35,6 +35,8 @@ static struct class *pyra_class;
static void profile_activated(struct pyra_device *pyra, static void profile_activated(struct pyra_device *pyra,
unsigned int new_profile) unsigned int new_profile)
{ {
if (new_profile >= ARRAY_SIZE(pyra->profile_settings))
return;
pyra->actual_profile = new_profile; pyra->actual_profile = new_profile;
pyra->actual_cpi = pyra->profile_settings[pyra->actual_profile].y_cpi; pyra->actual_cpi = pyra->profile_settings[pyra->actual_profile].y_cpi;
} }
...@@ -299,10 +301,15 @@ static ssize_t pyra_sysfs_write_settings(struct file *fp, ...@@ -299,10 +301,15 @@ static ssize_t pyra_sysfs_write_settings(struct file *fp,
int retval = 0; int retval = 0;
int difference; int difference;
struct pyra_roccat_report roccat_report; struct pyra_roccat_report roccat_report;
struct pyra_settings const *settings;
if (off != 0 || count != sizeof(struct pyra_settings)) if (off != 0 || count != sizeof(struct pyra_settings))
return -EINVAL; return -EINVAL;
settings = (struct pyra_settings const *)buf;
if (settings->startup_profile >= ARRAY_SIZE(pyra->profile_settings))
return -EINVAL;
mutex_lock(&pyra->pyra_lock); mutex_lock(&pyra->pyra_lock);
difference = memcmp(buf, &pyra->settings, sizeof(struct pyra_settings)); difference = memcmp(buf, &pyra->settings, sizeof(struct pyra_settings));
if (difference) { if (difference) {
......
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