|
@@ -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) ?
|