Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d9d6e91 authored by David Herrmann's avatar David Herrmann Committed by Dmitry Torokhov
Browse files

Input: uinput - fix setting up device name 



The check for non-empty device name was botched since we tried to account
for extra space for the terminating zero at the same time. Convert to
kstrndup() to avoid this problem.

Signed-off-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Acked-by: default avatarAristeu Rozanski <aris@ruivo.org>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 26cdb1ae

drivers/input/misc/uinput.c

+6 −7
Original line number Diff line number Diff line
@@ -347,8 +347,7 @@ static int uinput_setup_device(struct uinput_device *udev, const char __user *bu 
{

	struct uinput_user_dev	*user_dev;

	struct input_dev	*dev;

	char			*name;

	int			i, size;

	int			i;

	int			retval;



	if (count != sizeof(struct uinput_user_dev))
@@ -373,19 +372,19 @@ static int uinput_setup_device(struct uinput_device *udev, const char __user *bu 


	udev->ff_effects_max = user_dev->ff_effects_max;



	size = strnlen(user_dev->name, UINPUT_MAX_NAME_SIZE) + 1;

	if (!size) {

	/* Ensure name is filled in */

	if (!user_dev->name[0]) {

		retval = -EINVAL;

		goto exit;

	}



	kfree(dev->name);

	dev->name = name = kmalloc(size, GFP_KERNEL);

	if (!name) {

	dev->name = kstrndup(user_dev->name, UINPUT_MAX_NAME_SIZE,

			     GFP_KERNEL);

	if (!dev->name) {

		retval = -ENOMEM;

		goto exit;

	}

	strlcpy(name, user_dev->name, size);



	dev->id.bustype	= user_dev->id.bustype;

	dev->id.vendor	= user_dev->id.vendor;