diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-01-09 13:32:31 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-01-09 14:41:01 +0100 |
| commit | 606185b20caf4c57d7e41e5a5ea4aff460aef2ab (patch) | |
| tree | 87bf17410210321b32cf170fa06e8e91e0e98fa5 /drivers/hid/hid-roccat-pyra.c | |
| parent | HID: Add a new id 0x501a for Genius MousePen i608X (diff) | |
| download | linux-606185b20caf4c57d7e41e5a5ea4aff460aef2ab.tar.xz linux-606185b20caf4c57d7e41e5a5ea4aff460aef2ab.zip | |
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.
Cc: <stable@vger.kernel.org>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-roccat-pyra.c')
| -rw-r--r-- | drivers/hid/hid-roccat-pyra.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/hid/hid-roccat-pyra.c b/drivers/hid/hid-roccat-pyra.c index 1a07e07d99a0..47d7e74231e5 100644 --- a/drivers/hid/hid-roccat-pyra.c +++ b/drivers/hid/hid-roccat-pyra.c @@ -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) { |