lkml.org 
[lkml]   [2015]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/2] Input: uinput: Sanity check on ff_effects_max and EV_FF
Date
Currently the user can specify a non-zero value for ff_effects_max,
without setting the EV_FF bit.
Inversely,
the user can also set ff_effects_max to zero with the EV_FF bit set,
in this case the uninitialized method ff->upload can be dereferenced,
resulting in a kernel oops.

Instead of adding a check in uinput_create_device() and
omitting setup of ff-core infrastructure silently in case the check fails,
perform the check early in uinput_setup_device(),
and print a helpful message and return -EINVAL in case the check fails.

Signed-off-by: Elias Vanderstuyft <elias.vds@gmail.com>
---
drivers/input/misc/uinput.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)

diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 345df9b..3a90a16 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -393,6 +393,21 @@ static int uinput_setup_device(struct uinput_device *udev,
if (IS_ERR(user_dev))
return PTR_ERR(user_dev);

+ if (!!user_dev->ff_effects_max ^ test_bit(EV_FF, dev->evbit)) {
+ if (user_dev->ff_effects_max)
+ printk(KERN_DEBUG
+ "%s: ff_effects_max (%u) should be zero "
+ "when FF_BIT is not set\n",
+ UINPUT_NAME, user_dev->ff_effects_max);
+ else
+ printk(KERN_DEBUG
+ "%s: ff_effects_max should be non-zero "
+ "when FF_BIT is set\n",
+ UINPUT_NAME);
+ retval = -EINVAL;
+ goto exit;
+ }
+
udev->ff_effects_max = user_dev->ff_effects_max;

/* Ensure name is filled in */
--
1.9.3


\
 
 \ /
  Last update: 2015-09-17 20:01    [W:0.077 / U:0.068 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site