summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorBenjamin Tissoires <bentiss@kernel.org>2025-09-12 18:58:51 +0200
committerJiri Kosina <jkosina@suse.com>2025-09-17 11:37:23 +0200
commit75d5546f60b36900051d75ee623fceccbeb6750c (patch)
tree719960fbed6a2a8f900d3f7074c2749bcac171fc /include/uapi
parent8c62074fa824db0878a039e40f8424c3c3284f42 (diff)
HID: hidraw: tighten ioctl command parsing
The handling for variable-length ioctl commands in hidraw_ioctl() is rather complex and the check for the data direction is incomplete. Simplify this code by factoring out the various ioctls grouped by dir and size, and using a switch() statement with the size masked out, to ensure the rest of the command is correctly matched. Fixes: 9188e79ec3fd ("HID: add phys and name ioctls to hidraw") Reported-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Benjamin Tissoires <bentiss@kernel.org> Signed-off-by: Jiri Kosina <jkosina@suse.com>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/hidraw.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/hidraw.h b/include/uapi/linux/hidraw.h
index d5ee269864e0..ebd701b3c18d 100644
--- a/include/uapi/linux/hidraw.h
+++ b/include/uapi/linux/hidraw.h
@@ -48,6 +48,8 @@ struct hidraw_devinfo {
#define HIDIOCGOUTPUT(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x0C, len)
#define HIDIOCREVOKE _IOW('H', 0x0D, int) /* Revoke device access */
+#define HIDIOCTL_LAST _IOC_NR(HIDIOCREVOKE)
+
#define HIDRAW_FIRST_MINOR 0
#define HIDRAW_MAX_DEVICES 64
/* number of reports to buffer */