Commit 029b1836 authored by Gabriel Laskar's avatar Gabriel Laskar Committed by Dmitry Torokhov

Input: uinput - fix ioctl nr overflow for UI_GET_SYSNAME/VERSION

Request number for ioctls are encoded as 8bit numbers, but unfortunately
UI_GET_SYSNAME and UI_GET_VERSION specifu values larger than that, so they
get truncated to 44 (0x2c) and 45 (0x2d). This change makes requested
values match their effective values (the ABI stays intact).
Signed-off-by: default avatarGabriel Laskar <gabriel@lse.epita.fr>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 9333caea
...@@ -82,7 +82,7 @@ struct uinput_ff_erase { ...@@ -82,7 +82,7 @@ struct uinput_ff_erase {
* The complete sysfs path is then /sys/devices/virtual/input/--NAME-- * The complete sysfs path is then /sys/devices/virtual/input/--NAME--
* Usually, it is in the form "inputN" * Usually, it is in the form "inputN"
*/ */
#define UI_GET_SYSNAME(len) _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 300, len) #define UI_GET_SYSNAME(len) _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 44, len)
/** /**
* UI_GET_VERSION - Return version of uinput protocol * UI_GET_VERSION - Return version of uinput protocol
...@@ -91,7 +91,7 @@ struct uinput_ff_erase { ...@@ -91,7 +91,7 @@ struct uinput_ff_erase {
* the integer pointed to by the ioctl argument. The protocol version * the integer pointed to by the ioctl argument. The protocol version
* is hard-coded in the kernel and is independent of the uinput device. * is hard-coded in the kernel and is independent of the uinput device.
*/ */
#define UI_GET_VERSION _IOR(UINPUT_IOCTL_BASE, 301, unsigned int) #define UI_GET_VERSION _IOR(UINPUT_IOCTL_BASE, 45, unsigned int)
/* /*
* To write a force-feedback-capable driver, the upload_effect * To write a force-feedback-capable driver, the upload_effect
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment