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

Commit dd2ed487 authored by Daniel Mack's avatar Daniel Mack Committed by Jiri Kosina
Browse files

HID: 'name' and 'phys' in 'struct hid_device' can never be NULL 



As they are static members of fix size, there is no need to NULL-check them.

Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 8c4e708d

drivers/hid/hidraw.c

+2 −12
Original line number Diff line number Diff line
@@ -395,12 +395,7 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, 
				}



				if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWNAME(0))) {

					int len;

					if (!hid->name) {

						ret = 0;

						break;

					}

					len = strlen(hid->name) + 1;

					int len = strlen(hid->name) + 1;

					if (len > _IOC_SIZE(cmd))

						len = _IOC_SIZE(cmd);

					ret = copy_to_user(user_arg, hid->name, len) ?
@@ -409,12 +404,7 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, 
				}



				if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWPHYS(0))) {

					int len;

					if (!hid->phys) {

						ret = 0;

						break;

					}

					len = strlen(hid->phys) + 1;

					int len = strlen(hid->phys) + 1;

					if (len > _IOC_SIZE(cmd))

						len = _IOC_SIZE(cmd);

					ret = copy_to_user(user_arg, hid->phys, len) ?

drivers/hid/usbhid/hiddev.c

+2 −16
Original line number Diff line number Diff line
@@ -801,14 +801,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
			break;



		if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGNAME(0))) {

			int len;



			if (!hid->name) {

				r = 0;

				break;

			}



			len = strlen(hid->name) + 1;

			int len = strlen(hid->name) + 1;

			if (len > _IOC_SIZE(cmd))

				 len = _IOC_SIZE(cmd);

			r = copy_to_user(user_arg, hid->name, len) ?
@@ -817,14 +810,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		}



		if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGPHYS(0))) {

			int len;



			if (!hid->phys) {

				r = 0;

				break;

			}



			len = strlen(hid->phys) + 1;

			int len = strlen(hid->phys) + 1;

			if (len > _IOC_SIZE(cmd))

				len = _IOC_SIZE(cmd);

			r = copy_to_user(user_arg, hid->phys, len) ?