diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2020-01-27 15:49:30 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-01-27 15:49:30 +0100 |
| commit | a09ac40e420d547f58a40608f05a3a3b3a538ce8 (patch) | |
| tree | f1f71874f2224c083f2e9469148f53e27fd49a7f | |
| parent | 9e635c2851df6caee651e589fbf937b637973c91 (diff) | |
| parent | 2f48865db3322f8e74f51ff93b91e5c2916dd259 (diff) | |
| download | linux-a09ac40e420d547f58a40608f05a3a3b3a538ce8.tar.bz2 | |
Merge branch 'for-5.6/hidraw' into for-linus
- support for uniq ioctl()
| -rw-r--r-- | drivers/hid/hidraw.c | 9 | ||||
| -rw-r--r-- | include/uapi/linux/hidraw.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index 7a75aff78388..2eee5e31c2b7 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c @@ -451,6 +451,15 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, -EFAULT : len; break; } + + if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWUNIQ(0))) { + int len = strlen(hid->uniq) + 1; + if (len > _IOC_SIZE(cmd)) + len = _IOC_SIZE(cmd); + ret = copy_to_user(user_arg, hid->uniq, len) ? + -EFAULT : len; + break; + } } ret = -ENOTTY; diff --git a/include/uapi/linux/hidraw.h b/include/uapi/linux/hidraw.h index 98e2c493de85..4913539e5bcc 100644 --- a/include/uapi/linux/hidraw.h +++ b/include/uapi/linux/hidraw.h @@ -39,6 +39,7 @@ struct hidraw_devinfo { /* The first byte of SFEATURE and GFEATURE is the report number */ #define HIDIOCSFEATURE(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x06, len) #define HIDIOCGFEATURE(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x07, len) +#define HIDIOCGRAWUNIQ(len) _IOC(_IOC_READ, 'H', 0x08, len) #define HIDRAW_FIRST_MINOR 0 #define HIDRAW_MAX_DEVICES 64 |