AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

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

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

Signed-off-by: Daniel Mack <zonque@gmail.com>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Daniel Mack 2011-05-15 18:07:42 +02:00 committed by Jiri Kosina
parent 8c4e708d01
commit dd2ed487fd
2 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/hid/hidraw.c
View File

@ -395,12 +395,7 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd,
} }
if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWNAME(0))) { if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWNAME(0))) {
int len; int len = strlen(hid->name) + 1;
if (!hid->name) {
ret = 0;
break;
}
len = strlen(hid->name) + 1;
if (len > _IOC_SIZE(cmd)) if (len > _IOC_SIZE(cmd))
len = _IOC_SIZE(cmd); len = _IOC_SIZE(cmd);
ret = copy_to_user(user_arg, hid->name, len) ? 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))) { if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWPHYS(0))) {
int len; int len = strlen(hid->phys) + 1;
if (!hid->phys) {
ret = 0;
break;
}
len = strlen(hid->phys) + 1;
if (len > _IOC_SIZE(cmd)) if (len > _IOC_SIZE(cmd))
len = _IOC_SIZE(cmd); len = _IOC_SIZE(cmd);
ret = copy_to_user(user_arg, hid->phys, len) ? ret = copy_to_user(user_arg, hid->phys, len) ?

18
drivers/hid/usbhid/hiddev.c
View File

@ -801,14 +801,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
break; break;
if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGNAME(0))) { if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGNAME(0))) {
int len; int len = strlen(hid->name) + 1;
if (!hid->name) {
r = 0;
break;
}
len = strlen(hid->name) + 1;
if (len > _IOC_SIZE(cmd)) if (len > _IOC_SIZE(cmd))
len = _IOC_SIZE(cmd); len = _IOC_SIZE(cmd);
r = copy_to_user(user_arg, hid->name, len) ? 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))) { if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGPHYS(0))) {
int len; int len = strlen(hid->phys) + 1;
if (!hid->phys) {
r = 0;
break;
}
len = strlen(hid->phys) + 1;
if (len > _IOC_SIZE(cmd)) if (len > _IOC_SIZE(cmd))
len = _IOC_SIZE(cmd); len = _IOC_SIZE(cmd);
r = copy_to_user(user_arg, hid->phys, len) ? r = copy_to_user(user_arg, hid->phys, len) ?