linux-kernel - [PATCH 2/2] Input: uinput: Sanity check on ff_effects_max and EV

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 17 Sep 2015 19:29:48 +0200
From:	Elias Vanderstuyft <elias.vds@...il.com>
To:	Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc:	linux-input@...r.kernel.org, linux-api@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Elias Vanderstuyft <elias.vds@...il.com>
Subject: [PATCH 2/2] Input: uinput: Sanity check on ff_effects_max and EV_FF

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@...il.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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/