evdev: do not rely on EVIOC* constants provided in <linux/input.h>

* xlat/evdev_ioctl_cmds.in: New file.
* configure.ac (AC_CHECK_HEADERS([linux/input.h])): Check for struct
input_keymap_entry and struct input_mask.
* evdev.c [!INPUT_PROP_MAX] (INPUT_PROP_MAX): New macro definition.
(struct_input_keymap_entry, struct_input_mask): New typedefs.
[HAVE_STRUCT_INPUT_KEYMAP_ENTRY]: Add a static_assert to check
that sizeof(struct input_keymap_entry) has the expected value.
[HAVE_STRUCT_INPUT_MASK]: Add a static_assert to check
that sizeof(struct input_mask) has the expected value.
[!EVIOCGPROP] (EVIOCGPROP): New macro definition.
[!EVIOCGMTSLOTS] (EVIOCGMTSLOTS): Likewise.
[!EVIOCGSW] (EVIOCGSW): Likewise.
[!EVIOCGKEYCODE_V2] (keycode_V2_ioctl): Remove guard.
(keycode_V2_ioctl): Change type of ike to struct_input_keymap_entry.
[!EVIOCGMTSLOTS] (mtslots_ioctl): Remove guard.
[!EVIOCGREP || EVIOCSREP] (repeat_ioctl): Likewise.
(evdev_read_ioctl) [!EVIOCGREP] <case EVIOCGREP>: Likewise.
(evdev_read_ioctl) [!EVIOCGKEYCODE_V2] <case EVIOCGKEYCODE_V2>:
Likewise.
(evdev_read_ioctl) [!EVIOCGMTSLOTS] <case EVIOCGMTSLOTS>: Likewise.
(evdev_read_ioctl) [!EVIOCGPROP] <case EVIOCGPROP>: Likewise.
(evdev_read_ioctl) [!EVIOCGSW] <case EVIOCGSW>: Likewise.
(evdev_write_ioctl) [!EVIOCSREP] <case EVIOCSREP>: Likewise.
(evdev_write_ioctl) [!EVIOCSKEYCODE_V2] <case EVIOCSKEYCODE_V2>: Likewise.
(evdev_write_ioctl) [!EVIOCREVOKE] <case EVIOCREVOKE>: Likewise.
(evdev_write_ioctl) [!EVIOCSCLOCKID] <case EVIOCSCLOCKID>: Likewise.

References: https://bugzilla.redhat.com/show_bug.cgi?id=1758201

diff --git a/configure.ac b/configure.ac
index 866e65ab071d45cc724208d223e5f6ab84c847ff..1217ce9e5287cd2235251209cfcdbd1785f5c667 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -468,6 +468,10 @@ AC_CHECK_HEADERS(m4_normalize([
 #include <net/if.h>])
 
 AC_CHECK_HEADERS([linux/input.h], [
+       AC_CHECK_TYPES(m4_normalize([
+               struct input_keymap_entry,
+               struct input_mask
+       ]),,, [#include <linux/input.h>])
        AC_CHECK_MEMBERS([struct input_absinfo.resolution],,, [#include <linux/input.h>])
 ])
 

diff --git a/evdev.c b/evdev.c
index e2a2a8b30ca03a98f3b64c3cd53292ed91971ded..62a2226335321c6ebf342cf7c97074db95f1e693 100644 (file)
--- a/evdev.c
+++ b/evdev.c
@@ -29,10 +29,59 @@
 # include "xlat/evdev_snd.h"
 # include "xlat/evdev_switch.h"
 
+/** Added by Linux commit v2.6.38-rc1~247^2~1^2~2^2~5 */
+# ifndef INPUT_PROP_MAX
+#  define INPUT_PROP_MAX 0x1f
+# endif
 # ifndef SYN_MAX
 #  define SYN_MAX 0xf
 # endif
 
+/** Added by Linux commit v2.6.37-rc1~5^2~3^2~47 */
+typedef struct {
+       uint8_t  flags;
+       uint8_t  len;
+       uint16_t index;
+       uint32_t keycode;
+       uint8_t  scancode[32];
+} struct_input_keymap_entry;
+
+/** Added by Linux commit v4.4-rc1~11^2~3^2~2 */
+typedef struct {
+       uint32_t type;
+       uint32_t codes_size;
+       uint64_t codes_ptr;
+} struct_input_mask;
+
+# ifdef HAVE_STRUCT_INPUT_KEYMAP_ENTRY
+static_assert(sizeof(struct input_keymap_entry)
+             == sizeof(struct_input_keymap_entry),
+             "Unexpected struct input_keymap_entry size, please update "
+             "the decoder");
+# endif
+# ifdef HAVE_STRUCT_INPUT_MASK
+static_assert(sizeof(struct input_mask) == sizeof(struct_input_mask),
+             "Unexpected struct input_mask size, please update the decoder");
+# endif
+
+/*
+ * Has to be included after struct_* type definitions, since _IO* macros
+ * used in fallback definitions require them for sizeof().
+ */
+# define XLAT_MACROS_ONLY
+#  include "xlat/evdev_ioctl_cmds.h"
+# undef XLAT_MACROS_ONLY
+
+# ifndef EVIOCGPROP
+#  define EVIOCGPROP(len)      _IOR('E', 0x09, len)
+# endif
+# ifndef EVIOCGMTSLOTS
+#  define EVIOCGMTSLOTS(len)   _IOR('E', 0x0a, len)
+# endif
+# ifndef EVIOCGSW
+#  define EVIOCGSW(len)                _IOR('E', 0x1b, len)
+# endif
+
 static int
 abs_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
 {
@@ -83,13 +132,12 @@ keycode_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
        return RVAL_IOCTL_DECODED;
 }
 
-# ifdef EVIOCGKEYCODE_V2
 static int
 keycode_V2_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
 {
        tprints(", ");
 
-       struct input_keymap_entry ike;
+       struct_input_keymap_entry ike;
 
        if (umove_or_printaddr(tcp, arg, &ike))
                return RVAL_IOCTL_DECODED;
@@ -119,7 +167,6 @@ keycode_V2_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
 
        return RVAL_IOCTL_DECODED;
 }
-# endif /* EVIOCGKEYCODE_V2 */
 
 static int
 getid_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
@@ -211,7 +258,6 @@ decode_bitset(struct tcb *const tcp, const kernel_ulong_t arg,
        return RVAL_IOCTL_DECODED;
 }
 
-# ifdef EVIOCGMTSLOTS
 static int
 mtslots_ioctl(struct tcb *const tcp, const unsigned int code,
              const kernel_ulong_t arg)
@@ -242,9 +288,7 @@ mtslots_ioctl(struct tcb *const tcp, const unsigned int code,
 
        return RVAL_IOCTL_DECODED;
 }
-# endif /* EVIOCGMTSLOTS */
 
-# if defined EVIOCGREP || defined EVIOCSREP
 static int
 repeat_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
 {
@@ -252,7 +296,6 @@ repeat_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
        printpair_int(tcp, arg, "%u");
        return RVAL_IOCTL_DECODED;
 }
-# endif /* EVIOCGREP || EVIOCSREP */
 
 static int
 bit_ioctl(struct tcb *const tcp, const unsigned int ev_nr,
@@ -319,24 +362,18 @@ evdev_read_ioctl(struct tcb *const tcp, const unsigned int code,
                return RVAL_IOCTL_DECODED;
        case EVIOCGID:
                return getid_ioctl(tcp, arg);
-# ifdef EVIOCGREP
        case EVIOCGREP:
                return repeat_ioctl(tcp, arg);
-# endif
        case EVIOCGKEYCODE:
                return keycode_ioctl(tcp, arg);
-# ifdef EVIOCGKEYCODE_V2
        case EVIOCGKEYCODE_V2:
                return keycode_V2_ioctl(tcp, arg);
-# endif
        }
 
        /* fixed-number variable-length commands */
        switch (_IOC_NR(code)) {
-# ifdef EVIOCGMTSLOTS
        case _IOC_NR(EVIOCGMTSLOTS(0)):
                return mtslots_ioctl(tcp, code, arg);
-# endif
        case _IOC_NR(EVIOCGNAME(0)):
        case _IOC_NR(EVIOCGPHYS(0)):
        case _IOC_NR(EVIOCGUNIQ(0)):
@@ -346,19 +383,15 @@ evdev_read_ioctl(struct tcb *const tcp, const unsigned int code,
                else
                        printstrn(tcp, arg, tcp->u_rval);
                return RVAL_IOCTL_DECODED;
-# ifdef EVIOCGPROP
        case _IOC_NR(EVIOCGPROP(0)):
                return decode_bitset(tcp, arg, evdev_prop,
                                     INPUT_PROP_MAX, "PROP_???");
-# endif
        case _IOC_NR(EVIOCGSND(0)):
                return decode_bitset(tcp, arg, evdev_snd,
                                     SND_MAX, "SND_???");
-# ifdef EVIOCGSW
        case _IOC_NR(EVIOCGSW(0)):
                return decode_bitset(tcp, arg, evdev_switch,
                                     SW_MAX, "SW_???");
-# endif
        case _IOC_NR(EVIOCGKEY(0)):
                return decode_bitset(tcp, arg, evdev_keycode,
                                     KEY_MAX, "KEY_???");
@@ -384,31 +417,23 @@ evdev_write_ioctl(struct tcb *const tcp, const unsigned int code,
 {
        /* fixed-number fixed-length commands */
        switch (code) {
-# ifdef EVIOCSREP
        case EVIOCSREP:
                return repeat_ioctl(tcp, arg);
-# endif
        case EVIOCSKEYCODE:
                return keycode_ioctl(tcp, arg);
-# ifdef EVIOCSKEYCODE_V2
        case EVIOCSKEYCODE_V2:
                return keycode_V2_ioctl(tcp, arg);
-# endif
        case EVIOCRMFF:
                tprintf(", %d", (int) arg);
                return RVAL_IOCTL_DECODED;
        case EVIOCGRAB:
-# ifdef EVIOCREVOKE
        case EVIOCREVOKE:
-# endif
                tprintf(", %" PRI_klu, arg);
                return RVAL_IOCTL_DECODED;
-# ifdef EVIOCSCLOCKID
        case EVIOCSCLOCKID:
                tprints(", ");
                printnum_int(tcp, arg, "%u");
                return RVAL_IOCTL_DECODED;
-# endif
        }
 
        int rc = evdev_write_ioctl_mpers(tcp, code, arg);

diff --git a/xlat/evdev_ioctl_cmds.in b/xlat/evdev_ioctl_cmds.in
new file mode 100644 (file)
index 0000000..29a5864
--- /dev/null
+++ b/xlat/evdev_ioctl_cmds.in
@@ -0,0 +1,17 @@
+EVIOCGVERSION          _IOR('E', 0x01, int)
+EVIOCGID               _IOR('E', 0x02, struct input_id)
+EVIOCGREP              _IOR('E', 0x03, unsigned int[2])
+EVIOCSREP              _IOW('E', 0x03, unsigned int[2])
+EVIOCGKEYCODE          _IOR('E', 0x04, unsigned int[2])
+EVIOCGKEYCODE_V2       _IOR('E', 0x04, struct_input_keymap_entry)
+EVIOCSKEYCODE          _IOW('E', 0x04, unsigned int[2])
+EVIOCSKEYCODE_V2       _IOW('E', 0x04, struct_input_keymap_entry)
+/* struct ff_effect is personality-dependent in size */
+/* EVIOCSFF            _IOW('E', 0x80, struct ff_effect) */
+EVIOCRMFF              _IOW('E', 0x81, int)
+EVIOCGEFFECTS          _IOR('E', 0x84, int)
+EVIOCGRAB              _IOW('E', 0x90, int)
+EVIOCREVOKE            _IOW('E', 0x91, int)
+EVIOCGMASK             _IOR('E', 0x92, struct_input_mask)
+EVIOCSMASK             _IOW('E', 0x93, struct_input_mask)
+EVIOCSCLOCKID          _IOW('E', 0xa0, int)