Input: define separate EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2
Subsystems (3)
Dmitry Torokhov
maintainerRFC 1/1 Input: define separate EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2
The desire to keep old names for the EVIOCGKEYCODE/EVIOCSKEYCODE while extending them to support large scancodes was a mistake. While we tried to keep ABI intact (and we succeeded in doing that, programs compiled on older kernels will work on newer ones) there is still a problem with recompiling existing software with newer kernel headers.
New kernel headers will supply updated ioctl numbers and kernel will expect that userspace will use struct input_keymap_entry to set and retrieve keymap data. But since the names of ioctls are still the same userspace will happily compile even if not adjusted to make use of the new structure and will start miraculously fail in the field.
To avoid this issue let's revert EVIOCGKEYCODE/EVIOCSKEYCODE definitions and add EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2 so that userspace can explicitly select the style of ioctls it wants to employ.
---
drivers/input/evdev.c | 113 +++++++++++++++++++++++++------------------------ include/linux/input.h | 6 ++- 2 files changed, 62 insertions(+), 57 deletions(-)
drivers/input/evdev.c +58 -55
@@ -535,76 +535,73 @@ static int handle_eviocgbit(struct input_dev *dev, }#undef OLD_KEY_MAX -static int evdev_handle_get_keycode (struct input_dev *dev, -void __user *p,size_t size) +static int evdev_handle_get_keycode (struct input_dev *dev,void __user *p) { -struct input_keymap_entry ke; +struct input_keymap_entry ke = { + .len =sizeof (unsigned int ), + .flags =0 , + }; +int __user *ip = (int __user *)p;int error; -memset (&ke,0 ,sizeof (ke)); - -if (size ==sizeof (unsigned int [2 ])) { -/* legacy case */ -int __user *ip = (int __user *)p; +/* legacy case */ +if (copy_from_user (ke.scancode, p,sizeof (unsigned int ))) +return -EFAULT ; -if (copy_from_user (ke.scancode, p,sizeof (unsigned int ))) -return -EFAULT ; + error =input_get_keycode (dev, &ke); +if (error) +return error; - ke.len =sizeof (unsigned int ); - ke.flags =0 ; +if (put_user (ke.keycode, ip +1 )) +return -EFAULT ; - error =input_get_keycode (dev, &ke); -if (error) -return error; +return 0 ; +} -if (put_user (ke.keycode, ip +1 )) -return -EFAULT ; +static int evdev_handle_get_keycode_v2 (struct input_dev *dev,void __user *p) +{ +struct input_keymap_entry ke; +int error; - }else { - size =min (size,sizeof (ke)); +if (copy_from_user (&ke, p,sizeof (ke))) +return -EFAULT ; -if (copy_from_user (&ke, p, size)) -return -EFAULT ; + error =input_get_keycode (dev, &ke); +if (error) +return error; - error =input_get_keycode (dev, &ke); -if (error) -return error; +if (copy_to_user (p, &ke,sizeof (ke))) +return -EFAULT ; -if (copy_to_user (p, &ke, size)) -return -EFAULT ; - }return 0 ; } -static int evdev_handle_set_keycode (struct input_dev *dev, -void __user *p,size_t size) +static int evdev_handle_set_keycode (struct input_dev *dev,void __user *p) { -struct input_keymap_entry ke; - -memset (&ke,0 ,sizeof (ke)); +struct input_keymap_entry ke = { + .len =sizeof (unsigned int ), + .flags =0 , + }; +int __user *ip = (int __user *)p; -if (size ==sizeof (unsigned int [2 ])) { -/* legacy case */ -int __user *ip = (int __user *)p; +if (copy_from_user (ke.scancode, p,sizeof (unsigned int ))) +return -EFAULT ; -if (copy_from_user (ke.scancode, p,sizeof (unsigned int ))) -return -EFAULT ; +if (get_user (ke.keycode, ip +1 )) +return -EFAULT ; -if (get_user (ke.keycode, ip +1 )) -return -EFAULT ; +return input_set_keycode (dev, &ke); +} - ke.len =sizeof (unsigned int ); - ke.flags =0 ; +static int evdev_handle_set_keycode_v2 (struct input_dev *dev,void __user *p) +{ +struct input_keymap_entry ke; - }else { - size =min (size,sizeof (ke)); +if (copy_from_user (&ke, p,sizeof (ke))) +return -EFAULT ; -if (copy_from_user (&ke, p, size)) -return -EFAULT ; - -if (ke.len >sizeof (ke.scancode)) -return -EINVAL ; - } +if (ke.len >sizeof (ke.scancode)) +return -EINVAL ;return input_set_keycode (dev, &ke); }
@@ -670,6 +667,18 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd,return evdev_grab (evdev, client); else return evdev_ungrab(evdev, client); + +case EVIOCGKEYCODE : +return evdev_handle_get_keycode (dev, p); + +case EVIOCSKEYCODE : +return evdev_handle_set_keycode (dev, p); + +case EVIOCGKEYCODE_V2 : +return evdev_handle_get_keycode_v2 (dev, p); + +case EVIOCSKEYCODE_V2 : +return evdev_handle_set_keycode_v2 (dev, p); } size =_IOC_SIZE (cmd);
@@ -709,12 +718,6 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd,return -EFAULT ;return error; - -case EVIOC_MASK_SIZE (EVIOCGKEYCODE ): -return evdev_handle_get_keycode (dev, p, size); - -case EVIOC_MASK_SIZE (EVIOCSKEYCODE ): -return evdev_handle_set_keycode (dev, p, size); }/* Multi-number variable-length handlers */
include/linux/input.h +4 -2
@@ -104,8 +104,10 @@ struct input_keymap_entry {#define EVIOCGREP _IOR('E', 0x03, unsigned int[2])/* get repeat settings */ #define EVIOCSREP _IOW('E', 0x03, unsigned int[2])/* set repeat settings */ -#define EVIOCGKEYCODE _IOR('E', 0x04, struct input_keymap_entry)/* get keycode */ -#define EVIOCSKEYCODE _IOW('E', 0x04, struct input_keymap_entry)/* set keycode */ +#define EVIOCGKEYCODE _IOR('E', 0x04, unsigned int[2])/* get keycode */ +#define EVIOCGKEYCODE_V2 _IOR('E', 0x04, struct input_keymap_entry) +#define EVIOCSKEYCODE _IOW('E', 0x04, unsigned int[2])/* set keycode */ +#define EVIOCSKEYCODE_V2 _IOW('E', 0x04, struct input_keymap_entry)#define EVIOCGNAME (len) _IOC(_IOC_READ, 'E', 0x06, len)/* get device name */ #define EVIOCGPHYS (len) _IOC(_IOC_READ, 'E', 0x07, len)/* get physical location */
Quoted 12 lines · Dmitry Torokhov
The desire to keep old names for the EVIOCGKEYCODE/EVIOCSKEYCODE while extending them to support large scancodes was a mistake. While we tried to keep ABI intact (and we succeeded in doing that, programs compiled on older kernels will work on newer ones) there is still a problem with recompiling existing software with newer kernel headers.
New kernel headers will supply updated ioctl numbers and kernel will expect that userspace will use struct
input_keymap_entryto set and retrieve keymap data. But since the names of ioctls are still the same userspace will happily compile even if not adjusted to make use of the new structure and will start miraculously fail in the field.
Quoted 6 lines
To avoid this issue let's revert EVIOCGKEYCODE/EVIOCSKEYCODE definitions and add EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2 so that userspace can explicitly select the style of ioctls it wants to employ.
Signed-off-by Dmitry Torokhov <[email protected]>---
Would the header change suffice in itself? Either way, also checked that the bugfixes following the original patch is still in effect, so looks ok to me.
Henrik
Dmitry Torokhov
maintainerQuoted 18 lines · Henrik Rydberg
Quoted 16 lines · Dmitry Torokhov
The desire to keep old names for the EVIOCGKEYCODE/EVIOCSKEYCODE while extending them to support large scancodes was a mistake. While we tried to keep ABI intact (and we succeeded in doing that, programs compiled on older kernels will work on newer ones) there is still a problem with recompiling existing software with newer kernel headers.
New kernel headers will supply updated ioctl numbers and kernel will expect that userspace will use struct
input_keymap_entryto set and retrieve keymap data. But since the names of ioctls are still the same userspace will happily compile even if not adjusted to make use of the new structure and will start miraculously fail in the field.To avoid this issue let's revert EVIOCGKEYCODE/EVIOCSKEYCODE definitions and add EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2 so that userspace can explicitly select the style of ioctls it wants to employ.
Quoted 5 lines
Quoted 2 lines
Signed-off-by Dmitry Torokhov <[email protected]>---
Would the header change suffice in itself?
We still need to change evdev to return -EINVAL on wrong sizes but yes, the amount of change there could be more limited. I just thought that splitting it up explicitly shows the differences in handling better. If people prefer the previos version we could leave it, I am 50/50 between them.
Quoted 2 lines
Either way, also checked that the
bugfixes following the original patch is still in effect, so looks ok to me.
Thanks.
Signature · 1 line
Dmitry
Dmitry Torokhov
maintainerQuoted 23 lines · Dmitry Torokhov
Quoted 22 lines · Henrik Rydberg
Quoted 18 lines · Dmitry Torokhov
The desire to keep old names for the EVIOCGKEYCODE/EVIOCSKEYCODE while extending them to support large scancodes was a mistake. While we tried to keep ABI intact (and we succeeded in doing that, programs compiled on older kernels will work on newer ones) there is still a problem with recompiling existing software with newer kernel headers.
New kernel headers will supply updated ioctl numbers and kernel will expect that userspace will use struct
input_keymap_entryto set and retrieve keymap data. But since the names of ioctls are still the same userspace will happily compile even if not adjusted to make use of the new structure and will start miraculously fail in the field.To avoid this issue let's revert EVIOCGKEYCODE/EVIOCSKEYCODE definitions and add EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2 so that userspace can explicitly select the style of ioctls it wants to employ.
Signed-off-by Dmitry Torokhov <[email protected]>---
Quoted 8 lines
Quoted 1 line
Would the header change suffice in itself?
We still need to change evdev to return
-EINVALon wrong sizes but yes, the amount of change there could be more limited. I just thought that splitting it up explicitly shows the differences in handling better. If people prefer the previos version we could leave it, I am 50/50 between them.
*ping*
Mauro, Jarod, do you have an opinion on this? I think we need to settle on a solution before 2.6.37 is out.
Thanks.
Signature · 1 line
Dmitry
Jarod Wilson
Acked-byQuoted 33 lines · Dmitry Torokhov
Quoted 23 lines · Dmitry Torokhov
Quoted 22 lines · Henrik Rydberg
Quoted 18 lines · Dmitry Torokhov
The desire to keep old names for the EVIOCGKEYCODE/EVIOCSKEYCODE while extending them to support large scancodes was a mistake. While we tried to keep ABI intact (and we succeeded in doing that, programs compiled on older kernels will work on newer ones) there is still a problem with recompiling existing software with newer kernel headers.
New kernel headers will supply updated ioctl numbers and kernel will expect that userspace will use struct
input_keymap_entryto set and retrieve keymap data. But since the names of ioctls are still the same userspace will happily compile even if not adjusted to make use of the new structure and will start miraculously fail in the field.To avoid this issue let's revert EVIOCGKEYCODE/EVIOCSKEYCODE definitions and add EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2 so that userspace can explicitly select the style of ioctls it wants to employ.
Signed-off-by Dmitry Torokhov <[email protected]>---
Quoted 8 lines
Quoted 1 line
Would the header change suffice in itself?
We still need to change evdev to return
-EINVALon wrong sizes but yes, the amount of change there could be more limited. I just thought that splitting it up explicitly shows the differences in handling better. If people prefer the previos version we could leave it, I am 50/50 between them.
Quoted 4 lines
*ping*
Mauro, Jarod, do you have an opinion on this? I think we need to settle on a solution before 2.6.37 is out.
Sorry, been meaning to reply, just been quite tied up with other work... I'm of two minds on this as well, but probably leaning slightly in favor of going ahead with an explicit _V2 so as to not break existing userspace in new and unexpected ways. There presumably isn't much in the way of userspace already adapted to the new interface, and its simple to do another rev of those that have been. Okay, yeah, this is probably the best way to go about it.
Signature · 2 lines
Jarod Wilson [email protected]
Mauro Carvalho Chehab
Acked-byEm 13-12-2010 16:31, Jarod Wilson escreveu:
Quoted 47 lines · Dmitry Torokhov
Quoted 33 lines · Dmitry Torokhov
Quoted 23 lines · Henrik Rydberg
Quoted 22 lines · Dmitry Torokhov
Quoted 19 lines
The desire to keep old names for the EVIOCGKEYCODE/EVIOCSKEYCODE while extending them to support large scancodes was a mistake. While we tried to keep ABI intact (and we succeeded in doing that, programs compiled on older kernels will work on newer ones) there is still a problem with recompiling existing software with newer kernel headers.
New kernel headers will supply updated ioctl numbers and kernel will expect that userspace will use struct
input_keymap_entryto set and retrieve keymap data. But since the names of ioctls are still the same userspace will happily compile even if not adjusted to make use of the new structure and will start miraculously fail in the field.To avoid this issue let's revert EVIOCGKEYCODE/EVIOCSKEYCODE definitions and add EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2 so that userspace can explicitly select the style of ioctls it wants to employ.
Signed-off-by Dmitry Torokhov <[email protected]>---
Quoted 8 lines
Quoted 1 line
Would the header change suffice in itself?
We still need to change evdev to return
-EINVALon wrong sizes but yes, the amount of change there could be more limited. I just thought that splitting it up explicitly shows the differences in handling better. If people prefer the previos version we could leave it, I am 50/50 between them.Quoted 4 lines
*ping*
Mauro, Jarod, do you have an opinion on this? I think we need to settle on a solution before 2.6.37 is out.
Sorry, been meaning to reply, just been quite tied up with other work... I'm of two minds on this as well, but probably leaning slightly in favor of going ahead with an explicit
_V2so as to not break existing userspace in new and unexpected ways. There presumably isn't much in the way of userspace already adapted to the new interface, and its simple to do another rev of those that have been. Okay, yeah, this is probably the best way to go about it.
Quoted 3 lines
Acked-by Jarod Wilson <[email protected]>
I'm with some email troubles here. Not sure if you got my answer. I'm OK with those changes.
Cheers,
Mauro