diff options
Diffstat (limited to 'drivers/hid/hidraw.c')
| -rw-r--r-- | drivers/hid/hidraw.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index e263d4731179..00ccf4b1985d 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c | |||
| @@ -285,8 +285,10 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, | |||
| 285 | 285 | ||
| 286 | if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWNAME(0))) { | 286 | if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWNAME(0))) { |
| 287 | int len; | 287 | int len; |
| 288 | if (!hid->name) | 288 | if (!hid->name) { |
| 289 | return 0; | 289 | ret = 0; |
| 290 | break; | ||
| 291 | } | ||
| 290 | len = strlen(hid->name) + 1; | 292 | len = strlen(hid->name) + 1; |
| 291 | if (len > _IOC_SIZE(cmd)) | 293 | if (len > _IOC_SIZE(cmd)) |
| 292 | len = _IOC_SIZE(cmd); | 294 | len = _IOC_SIZE(cmd); |
| @@ -297,8 +299,10 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, | |||
| 297 | 299 | ||
| 298 | if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWPHYS(0))) { | 300 | if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWPHYS(0))) { |
| 299 | int len; | 301 | int len; |
| 300 | if (!hid->phys) | 302 | if (!hid->phys) { |
| 301 | return 0; | 303 | ret = 0; |
| 304 | break; | ||
| 305 | } | ||
| 302 | len = strlen(hid->phys) + 1; | 306 | len = strlen(hid->phys) + 1; |
| 303 | if (len > _IOC_SIZE(cmd)) | 307 | if (len > _IOC_SIZE(cmd)) |
| 304 | len = _IOC_SIZE(cmd); | 308 | len = _IOC_SIZE(cmd); |