|
 |
7a62b9 |
From cdd8206af74fcb961f0179e21eacf5d55d23f0ac Mon Sep 17 00:00:00 2001
|
|
|
7a62b9 |
From: Eugene Syromyatnikov <evgsyr@gmail.com>
|
|
|
7a62b9 |
Date: Fri, 12 Jul 2019 14:31:44 +0200
|
|
|
7a62b9 |
Subject: [PATCH 3/3] tests: test evdev bitset decoding more thoroughly
|
|
|
7a62b9 |
|
|
|
7a62b9 |
* tests/ioctl_evdev-success-v.test: Inject various values.
|
|
|
7a62b9 |
* tests/ioctl_evdev-success.test: Likewise.
|
|
|
7a62b9 |
* tests/ioctl_evdev-success.c (NUM_WORDS): New macro.
|
|
|
7a62b9 |
(struct evdev_check): Constify arg_ptr and print_arg args.
|
|
|
7a62b9 |
(invoke_test_syscall, test_evdev, print_input_absinfo, print_input_id,
|
|
|
7a62b9 |
print_mtslots): Add const qualifiers.
|
|
|
7a62b9 |
(print_getbit): Add const qualifiers, rewrite to expect trailing NULL
|
|
|
7a62b9 |
in the string array instead of leading string count.
|
|
|
7a62b9 |
(main): Set size for ev_more, ev_less, ev_zero arrays; replace leading
|
|
|
7a62b9 |
count element in ev_more_str, ev_less_str, ev_zero_str with trailing
|
|
|
7a62b9 |
NULL; replace ev_more_str and ev_less_str with ev_more_str_2/ev_less_str_2
|
|
|
7a62b9 |
and ev_more_str_3/ev_less_str_3 that differ by presence of flags that reside
|
|
|
7a62b9 |
beyond first two bytes; add static and const qualifiers where possible;
|
|
|
7a62b9 |
add key/key_sts_8/key_str_16 values; update a to provide either ev_more_str_2
|
|
|
7a62b9 |
or ev_more_str_3 and either key_str_8 or key_str_16 depending on inject_retval
|
|
|
7a62b9 |
value.
|
|
|
7a62b9 |
---
|
|
|
7a62b9 |
tests/ioctl_evdev-success-v.test | 15 +++---
|
|
|
7a62b9 |
tests/ioctl_evdev-success.c | 100 ++++++++++++++++++++++++++-------------
|
|
|
7a62b9 |
tests/ioctl_evdev-success.test | 15 +++---
|
|
|
7a62b9 |
3 files changed, 84 insertions(+), 46 deletions(-)
|
|
|
7a62b9 |
|
|
|
7a62b9 |
Index: strace-4.24/tests/ioctl_evdev-success-v.test
|
|
|
7a62b9 |
===================================================================
|
|
|
7a62b9 |
--- strace-4.24.orig/tests/ioctl_evdev-success-v.test 2019-08-01 18:40:58.009521546 +0200
|
|
|
7a62b9 |
+++ strace-4.24/tests/ioctl_evdev-success-v.test 2019-08-01 19:21:32.297062218 +0200
|
|
|
7a62b9 |
@@ -3,11 +3,14 @@
|
|
|
7a62b9 |
. "${srcdir=.}/scno_tampering.sh"
|
|
|
7a62b9 |
|
|
|
7a62b9 |
: ${IOCTL_INJECT_START=256}
|
|
|
7a62b9 |
-: ${IOCTL_INJECT_RETVAL=8}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
run_prog
|
|
|
7a62b9 |
-run_strace -a16 -v -e trace=ioctl \
|
|
|
7a62b9 |
- -e inject=ioctl:retval="${IOCTL_INJECT_RETVAL}":when="${IOCTL_INJECT_START}+" \
|
|
|
7a62b9 |
- ../ioctl_evdev-success-v "${IOCTL_INJECT_START}" "${IOCTL_INJECT_RETVAL}"> "$EXP"
|
|
|
7a62b9 |
-grep -v '^ioctl([012][,<]' < "$LOG" > "$OUT"
|
|
|
7a62b9 |
-match_diff "$OUT" "$EXP"
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
+for ret in 0 2 8 15 16; do
|
|
|
7a62b9 |
+ run_strace -a16 -v -e trace=ioctl \
|
|
|
7a62b9 |
+ -e inject=ioctl:retval="${ret}":when="${IOCTL_INJECT_START}+" \
|
|
|
7a62b9 |
+ ../ioctl_evdev-success-v \
|
|
|
7a62b9 |
+ "${IOCTL_INJECT_START}" "${ret}"> "$EXP.$ret"
|
|
|
7a62b9 |
+ grep -v '^ioctl([012][,<]' < "$LOG" > "$OUT.$ret"
|
|
|
7a62b9 |
+ match_diff "$OUT.$ret" "$EXP.$ret"
|
|
|
7a62b9 |
+done
|
|
|
7a62b9 |
Index: strace-4.24/tests/ioctl_evdev-success.c
|
|
|
7a62b9 |
===================================================================
|
|
|
7a62b9 |
--- strace-4.24.orig/tests/ioctl_evdev-success.c 2019-08-01 18:40:58.009521546 +0200
|
|
|
7a62b9 |
+++ strace-4.24/tests/ioctl_evdev-success.c 2019-08-01 19:21:32.297062218 +0200
|
|
|
7a62b9 |
@@ -2,6 +2,7 @@
|
|
|
7a62b9 |
|
|
|
7a62b9 |
#ifdef HAVE_LINUX_INPUT_H
|
|
|
7a62b9 |
|
|
|
7a62b9 |
+# include <assert.h>
|
|
|
7a62b9 |
# include <inttypes.h>
|
|
|
7a62b9 |
# include <stdio.h>
|
|
|
7a62b9 |
# include <stdlib.h>
|
|
|
7a62b9 |
@@ -9,17 +10,19 @@
|
|
|
7a62b9 |
# include <linux/input.h>
|
|
|
7a62b9 |
# include "print_fields.h"
|
|
|
7a62b9 |
|
|
|
7a62b9 |
+# define NUM_WORDS 4
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
static const char *errstr;
|
|
|
7a62b9 |
|
|
|
7a62b9 |
struct evdev_check {
|
|
|
7a62b9 |
unsigned long cmd;
|
|
|
7a62b9 |
const char *cmd_str;
|
|
|
7a62b9 |
- void *arg_ptr;
|
|
|
7a62b9 |
- void (*print_arg)(long rc, void *ptr, void *arg);
|
|
|
7a62b9 |
+ const void *arg_ptr;
|
|
|
7a62b9 |
+ void (*print_arg)(long rc, const void *ptr, const void *arg);
|
|
|
7a62b9 |
};
|
|
|
7a62b9 |
|
|
|
7a62b9 |
static long
|
|
|
7a62b9 |
-invoke_test_syscall(unsigned long cmd, void *p)
|
|
|
7a62b9 |
+invoke_test_syscall(unsigned long cmd, const void *p)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
long rc = ioctl(-1, cmd, p);
|
|
|
7a62b9 |
errstr = sprintrc(rc);
|
|
|
7a62b9 |
@@ -31,7 +34,7 @@
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
static void
|
|
|
7a62b9 |
-test_evdev(struct evdev_check *check, void *arg)
|
|
|
7a62b9 |
+test_evdev(struct evdev_check *check, const void *arg)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
long rc = invoke_test_syscall(check->cmd, check->arg_ptr);
|
|
|
7a62b9 |
printf("ioctl(-1, %s, ", check->cmd_str);
|
|
|
7a62b9 |
@@ -43,9 +46,9 @@
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
static void
|
|
|
7a62b9 |
-print_input_absinfo(long rc, void *ptr, void *arg)
|
|
|
7a62b9 |
+print_input_absinfo(long rc, const void *ptr, const void *arg)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
- struct input_absinfo *absinfo = ptr;
|
|
|
7a62b9 |
+ const struct input_absinfo *absinfo = ptr;
|
|
|
7a62b9 |
|
|
|
7a62b9 |
if (rc < 0) {
|
|
|
7a62b9 |
printf("%p", absinfo);
|
|
|
7a62b9 |
@@ -67,9 +70,9 @@
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
static void
|
|
|
7a62b9 |
-print_input_id(long rc, void *ptr, void *arg)
|
|
|
7a62b9 |
+print_input_id(long rc, const void *ptr, const void *arg)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
- struct input_id *id = ptr;
|
|
|
7a62b9 |
+ const struct input_id *id = ptr;
|
|
|
7a62b9 |
|
|
|
7a62b9 |
if (rc < 0) {
|
|
|
7a62b9 |
printf("%p", id);
|
|
|
7a62b9 |
@@ -84,10 +87,10 @@
|
|
|
7a62b9 |
|
|
|
7a62b9 |
# ifdef EVIOCGMTSLOTS
|
|
|
7a62b9 |
static void
|
|
|
7a62b9 |
-print_mtslots(long rc, void *ptr, void *arg)
|
|
|
7a62b9 |
+print_mtslots(long rc, const void *ptr, const void *arg)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
- int *buffer = ptr;
|
|
|
7a62b9 |
- const char **str = arg;
|
|
|
7a62b9 |
+ const int *buffer = ptr;
|
|
|
7a62b9 |
+ const char * const * str = arg;
|
|
|
7a62b9 |
int num = atoi(*(str + 1));
|
|
|
7a62b9 |
|
|
|
7a62b9 |
if (rc < 0) {
|
|
|
7a62b9 |
@@ -104,27 +107,26 @@
|
|
|
7a62b9 |
# endif
|
|
|
7a62b9 |
|
|
|
7a62b9 |
static void
|
|
|
7a62b9 |
-print_getbit(long rc, void *ptr, void *arg)
|
|
|
7a62b9 |
+print_getbit(long rc, const void *ptr, const void *arg)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
- const char **str = arg;
|
|
|
7a62b9 |
- int num = atoi(*str);
|
|
|
7a62b9 |
+ const char * const *str = arg;
|
|
|
7a62b9 |
|
|
|
7a62b9 |
- if (rc < 0) {
|
|
|
7a62b9 |
+ if (rc <= 0) {
|
|
|
7a62b9 |
printf("%p", ptr);
|
|
|
7a62b9 |
return;
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
printf("[");
|
|
|
7a62b9 |
- printf("%s", *(str + 1));
|
|
|
7a62b9 |
- for (unsigned int i = 2; i <= (unsigned) num; i++) {
|
|
|
7a62b9 |
+ for (unsigned long i = 0; str[i]; i++) {
|
|
|
7a62b9 |
# if ! VERBOSE
|
|
|
7a62b9 |
- if (i > 4) {
|
|
|
7a62b9 |
+ if (i >= 4) {
|
|
|
7a62b9 |
printf(", ...");
|
|
|
7a62b9 |
break;
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
# endif
|
|
|
7a62b9 |
- printf(", ");
|
|
|
7a62b9 |
- printf("%s", *(str + i));
|
|
|
7a62b9 |
+ if (i)
|
|
|
7a62b9 |
+ printf(", ");
|
|
|
7a62b9 |
+ printf("%s", str[i]);
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
printf("]");
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
@@ -170,6 +172,7 @@
|
|
|
7a62b9 |
TAIL_ALLOC_OBJECT_CONST_PTR(struct input_id, id);
|
|
|
7a62b9 |
TAIL_ALLOC_OBJECT_CONST_PTR(struct input_absinfo, absinfo);
|
|
|
7a62b9 |
TAIL_ALLOC_OBJECT_CONST_PTR(int, bad_addr_slot);
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
# ifdef EVIOCGMTSLOTS
|
|
|
7a62b9 |
int mtslots[] = { ABS_MT_SLOT, 1, 3 };
|
|
|
7a62b9 |
/* we use the second element to indicate the number of values */
|
|
|
7a62b9 |
@@ -183,36 +186,65 @@
|
|
|
7a62b9 |
const char *invalid_mtslot_str[] = { invalid_str, "1", "1" };
|
|
|
7a62b9 |
# endif
|
|
|
7a62b9 |
|
|
|
7a62b9 |
+ enum { ULONG_BIT = sizeof(unsigned long) * 8 };
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
/* set more than 4 bits */
|
|
|
7a62b9 |
- unsigned long ev_more[] = { 1 << EV_ABS | 1 << EV_MSC | 1 << EV_LED | 1 << EV_SND | 1 << EV_PWR };
|
|
|
7a62b9 |
- /* we use the first element to indicate the number of set bits */
|
|
|
7a62b9 |
- /* ev_more_str[0] is "5" so the number of set bits is 5 */
|
|
|
7a62b9 |
- const char *ev_more_str[] = { "5", "EV_ABS", "EV_MSC", "EV_LED", "EV_SND", "EV_PWR" };
|
|
|
7a62b9 |
+ static const unsigned long ev_more[NUM_WORDS] = {
|
|
|
7a62b9 |
+ 1 << EV_ABS | 1 << EV_MSC | 1 << EV_LED | 1 << EV_SND
|
|
|
7a62b9 |
+ | 1 << EV_PWR };
|
|
|
7a62b9 |
+ static const char * const ev_more_str_2[] = {
|
|
|
7a62b9 |
+ "EV_ABS", "EV_MSC", NULL };
|
|
|
7a62b9 |
+ static const char * const ev_more_str_3[] = {
|
|
|
7a62b9 |
+ "EV_ABS", "EV_MSC", "EV_LED", "EV_SND", "EV_PWR", NULL };
|
|
|
7a62b9 |
|
|
|
7a62b9 |
/* set less than 4 bits */
|
|
|
7a62b9 |
- unsigned long ev_less[] = { 1 << EV_ABS | 1 << EV_MSC | 1 << EV_LED };
|
|
|
7a62b9 |
- const char *ev_less_str[] = { "3", "EV_ABS", "EV_MSC", "EV_LED" };
|
|
|
7a62b9 |
+ static const unsigned long ev_less[NUM_WORDS] = {
|
|
|
7a62b9 |
+ 1 << EV_ABS | 1 << EV_MSC | 1 << EV_LED };
|
|
|
7a62b9 |
+ static const char * const ev_less_str_2[] = {
|
|
|
7a62b9 |
+ "EV_ABS", "EV_MSC", NULL };
|
|
|
7a62b9 |
+ static const char * const ev_less_str_3[] = {
|
|
|
7a62b9 |
+ "EV_ABS", "EV_MSC", "EV_LED", NULL };
|
|
|
7a62b9 |
|
|
|
7a62b9 |
/* set zero bit */
|
|
|
7a62b9 |
- unsigned long ev_zero[] = { 0x0 };
|
|
|
7a62b9 |
- const char *ev_zero_str[] = { "0", " 0 " };
|
|
|
7a62b9 |
+ static const unsigned long ev_zero[NUM_WORDS] = { 0x0 };
|
|
|
7a62b9 |
+ static const char * const ev_zero_str[] = { " 0 ", NULL };
|
|
|
7a62b9 |
|
|
|
7a62b9 |
/* KEY_MAX is 0x2ff which is greater than retval * 8 */
|
|
|
7a62b9 |
- unsigned long key[] = { 1 << KEY_1 | 1 << KEY_2, 0 };
|
|
|
7a62b9 |
- const char *key_str[] = { "2", "KEY_1", "KEY_2" };
|
|
|
7a62b9 |
+ static const unsigned long key[NUM_WORDS] = {
|
|
|
7a62b9 |
+ 1 << KEY_1 | 1 << KEY_2,
|
|
|
7a62b9 |
+ [ KEY_F12 / ULONG_BIT ] = 1 << (KEY_F12 % ULONG_BIT) };
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
+ static const char * const key_str_8[] = {
|
|
|
7a62b9 |
+ "KEY_1", "KEY_2", NULL };
|
|
|
7a62b9 |
+ static const char * const key_str_16[] = {
|
|
|
7a62b9 |
+ "KEY_1", "KEY_2", "KEY_F12", NULL };
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
+ assert(sizeof(ev_more) >= (unsigned long) inject_retval);
|
|
|
7a62b9 |
+ assert(sizeof(ev_less) >= (unsigned long) inject_retval);
|
|
|
7a62b9 |
+ assert(sizeof(ev_zero) >= (unsigned long) inject_retval);
|
|
|
7a62b9 |
+ assert(sizeof(key) >= (unsigned long) inject_retval);
|
|
|
7a62b9 |
|
|
|
7a62b9 |
struct {
|
|
|
7a62b9 |
struct evdev_check check;
|
|
|
7a62b9 |
- void *ptr;
|
|
|
7a62b9 |
+ const void *ptr;
|
|
|
7a62b9 |
} a[] = {
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGID), id, print_input_id }, NULL },
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGABS(ABS_X)), absinfo, print_input_absinfo }, NULL },
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGABS(ABS_Y)), absinfo, print_input_absinfo }, NULL },
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGABS(ABS_Y)), absinfo, print_input_absinfo }, NULL },
|
|
|
7a62b9 |
- { { ARG_STR(EVIOCGBIT(0, 0)), ev_more, print_getbit }, &ev_more_str },
|
|
|
7a62b9 |
- { { ARG_STR(EVIOCGBIT(0, 0)), ev_less, print_getbit }, &ev_less_str },
|
|
|
7a62b9 |
+ { { ARG_STR(EVIOCGBIT(0, 0)), ev_more, print_getbit },
|
|
|
7a62b9 |
+ inject_retval * 8 <= EV_LED
|
|
|
7a62b9 |
+ ? (const void *) &ev_more_str_2
|
|
|
7a62b9 |
+ : (const void *) &ev_more_str_3 },
|
|
|
7a62b9 |
+ { { ARG_STR(EVIOCGBIT(0, 0)), ev_less, print_getbit },
|
|
|
7a62b9 |
+ inject_retval * 8 <= EV_LED
|
|
|
7a62b9 |
+ ? (const void *) &ev_less_str_2
|
|
|
7a62b9 |
+ : (const void *) &ev_less_str_3 },
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGBIT(0, 0)), ev_zero, print_getbit }, &ev_zero_str },
|
|
|
7a62b9 |
- { { ARG_STR(EVIOCGBIT(EV_KEY, 0)), key, print_getbit }, &key_str},
|
|
|
7a62b9 |
+ { { ARG_STR(EVIOCGBIT(EV_KEY, 0)), key, print_getbit },
|
|
|
7a62b9 |
+ inject_retval * 8 <= KEY_F12
|
|
|
7a62b9 |
+ ? (const void *) &key_str_8
|
|
|
7a62b9 |
+ : (const void *) &key_str_16 },
|
|
|
7a62b9 |
# ifdef EVIOCGMTSLOTS
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGMTSLOTS(12)), mtslots, print_mtslots }, &mtslots_str },
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGMTSLOTS(8)), invalid_mtslot, print_mtslots }, &invalid_mtslot_str }
|
|
|
7a62b9 |
Index: strace-4.24/tests/ioctl_evdev-success.test
|
|
|
7a62b9 |
===================================================================
|
|
|
7a62b9 |
--- strace-4.24.orig/tests/ioctl_evdev-success.test 2019-08-01 18:40:58.009521546 +0200
|
|
|
7a62b9 |
+++ strace-4.24/tests/ioctl_evdev-success.test 2019-08-01 19:21:32.298062205 +0200
|
|
|
7a62b9 |
@@ -3,11 +3,14 @@
|
|
|
7a62b9 |
. "${srcdir=.}/scno_tampering.sh"
|
|
|
7a62b9 |
|
|
|
7a62b9 |
: ${IOCTL_INJECT_START=256}
|
|
|
7a62b9 |
-: ${IOCTL_INJECT_RETVAL=8}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
run_prog
|
|
|
7a62b9 |
-run_strace -a16 -e trace=ioctl \
|
|
|
7a62b9 |
- -e inject=ioctl:retval="${IOCTL_INJECT_RETVAL}":when="${IOCTL_INJECT_START}+" \
|
|
|
7a62b9 |
- ../ioctl_evdev-success "${IOCTL_INJECT_START}" "${IOCTL_INJECT_RETVAL}"> "$EXP"
|
|
|
7a62b9 |
-grep -v '^ioctl([012][,<]' < "$LOG" > "$OUT"
|
|
|
7a62b9 |
-match_diff "$OUT" "$EXP"
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
+for ret in 0 2 8 15 16; do
|
|
|
7a62b9 |
+ run_strace -a16 -e trace=ioctl \
|
|
|
7a62b9 |
+ -e inject=ioctl:retval="${ret}":when="${IOCTL_INJECT_START}+" \
|
|
|
7a62b9 |
+ ../ioctl_evdev-success \
|
|
|
7a62b9 |
+ "${IOCTL_INJECT_START}" "${ret}"> "$EXP.${ret}"
|
|
|
7a62b9 |
+ grep -v '^ioctl([012][,<]' < "$LOG" > "$OUT.$ret"
|
|
|
7a62b9 |
+ match_diff "$OUT.$ret" "$EXP.$ret"
|
|
|
7a62b9 |
+done
|
|
|
7a62b9 |
Index: strace-4.24/tests-m32/ioctl_evdev-success-v.test
|
|
|
7a62b9 |
===================================================================
|
|
|
7a62b9 |
--- strace-4.24.orig/tests-m32/ioctl_evdev-success-v.test 2019-08-01 18:40:58.009521546 +0200
|
|
|
7a62b9 |
+++ strace-4.24/tests-m32/ioctl_evdev-success-v.test 2019-08-01 19:21:32.298062205 +0200
|
|
|
7a62b9 |
@@ -3,11 +3,14 @@
|
|
|
7a62b9 |
. "${srcdir=.}/scno_tampering.sh"
|
|
|
7a62b9 |
|
|
|
7a62b9 |
: ${IOCTL_INJECT_START=256}
|
|
|
7a62b9 |
-: ${IOCTL_INJECT_RETVAL=8}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
run_prog
|
|
|
7a62b9 |
-run_strace -a16 -v -e trace=ioctl \
|
|
|
7a62b9 |
- -e inject=ioctl:retval="${IOCTL_INJECT_RETVAL}":when="${IOCTL_INJECT_START}+" \
|
|
|
7a62b9 |
- ../ioctl_evdev-success-v "${IOCTL_INJECT_START}" "${IOCTL_INJECT_RETVAL}"> "$EXP"
|
|
|
7a62b9 |
-grep -v '^ioctl([012][,<]' < "$LOG" > "$OUT"
|
|
|
7a62b9 |
-match_diff "$OUT" "$EXP"
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
+for ret in 0 2 8 15 16; do
|
|
|
7a62b9 |
+ run_strace -a16 -v -e trace=ioctl \
|
|
|
7a62b9 |
+ -e inject=ioctl:retval="${ret}":when="${IOCTL_INJECT_START}+" \
|
|
|
7a62b9 |
+ ../ioctl_evdev-success-v \
|
|
|
7a62b9 |
+ "${IOCTL_INJECT_START}" "${ret}"> "$EXP.$ret"
|
|
|
7a62b9 |
+ grep -v '^ioctl([012][,<]' < "$LOG" > "$OUT.$ret"
|
|
|
7a62b9 |
+ match_diff "$OUT.$ret" "$EXP.$ret"
|
|
|
7a62b9 |
+done
|
|
|
7a62b9 |
Index: strace-4.24/tests-m32/ioctl_evdev-success.test
|
|
|
7a62b9 |
===================================================================
|
|
|
7a62b9 |
--- strace-4.24.orig/tests-m32/ioctl_evdev-success.test 2019-08-01 18:40:58.009521546 +0200
|
|
|
7a62b9 |
+++ strace-4.24/tests-m32/ioctl_evdev-success.test 2019-08-01 19:21:32.298062205 +0200
|
|
|
7a62b9 |
@@ -3,11 +3,14 @@
|
|
|
7a62b9 |
. "${srcdir=.}/scno_tampering.sh"
|
|
|
7a62b9 |
|
|
|
7a62b9 |
: ${IOCTL_INJECT_START=256}
|
|
|
7a62b9 |
-: ${IOCTL_INJECT_RETVAL=8}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
run_prog
|
|
|
7a62b9 |
-run_strace -a16 -e trace=ioctl \
|
|
|
7a62b9 |
- -e inject=ioctl:retval="${IOCTL_INJECT_RETVAL}":when="${IOCTL_INJECT_START}+" \
|
|
|
7a62b9 |
- ../ioctl_evdev-success "${IOCTL_INJECT_START}" "${IOCTL_INJECT_RETVAL}"> "$EXP"
|
|
|
7a62b9 |
-grep -v '^ioctl([012][,<]' < "$LOG" > "$OUT"
|
|
|
7a62b9 |
-match_diff "$OUT" "$EXP"
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
+for ret in 0 2 8 15 16; do
|
|
|
7a62b9 |
+ run_strace -a16 -e trace=ioctl \
|
|
|
7a62b9 |
+ -e inject=ioctl:retval="${ret}":when="${IOCTL_INJECT_START}+" \
|
|
|
7a62b9 |
+ ../ioctl_evdev-success \
|
|
|
7a62b9 |
+ "${IOCTL_INJECT_START}" "${ret}"> "$EXP.${ret}"
|
|
|
7a62b9 |
+ grep -v '^ioctl([012][,<]' < "$LOG" > "$OUT.$ret"
|
|
|
7a62b9 |
+ match_diff "$OUT.$ret" "$EXP.$ret"
|
|
|
7a62b9 |
+done
|
|
|
7a62b9 |
Index: strace-4.24/tests-mx32/ioctl_evdev-success-v.test
|
|
|
7a62b9 |
===================================================================
|
|
|
7a62b9 |
--- strace-4.24.orig/tests-mx32/ioctl_evdev-success-v.test 2019-08-01 18:40:58.009521546 +0200
|
|
|
7a62b9 |
+++ strace-4.24/tests-mx32/ioctl_evdev-success-v.test 2019-08-01 19:21:32.298062205 +0200
|
|
|
7a62b9 |
@@ -3,11 +3,14 @@
|
|
|
7a62b9 |
. "${srcdir=.}/scno_tampering.sh"
|
|
|
7a62b9 |
|
|
|
7a62b9 |
: ${IOCTL_INJECT_START=256}
|
|
|
7a62b9 |
-: ${IOCTL_INJECT_RETVAL=8}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
run_prog
|
|
|
7a62b9 |
-run_strace -a16 -v -e trace=ioctl \
|
|
|
7a62b9 |
- -e inject=ioctl:retval="${IOCTL_INJECT_RETVAL}":when="${IOCTL_INJECT_START}+" \
|
|
|
7a62b9 |
- ../ioctl_evdev-success-v "${IOCTL_INJECT_START}" "${IOCTL_INJECT_RETVAL}"> "$EXP"
|
|
|
7a62b9 |
-grep -v '^ioctl([012][,<]' < "$LOG" > "$OUT"
|
|
|
7a62b9 |
-match_diff "$OUT" "$EXP"
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
+for ret in 0 2 8 15 16; do
|
|
|
7a62b9 |
+ run_strace -a16 -v -e trace=ioctl \
|
|
|
7a62b9 |
+ -e inject=ioctl:retval="${ret}":when="${IOCTL_INJECT_START}+" \
|
|
|
7a62b9 |
+ ../ioctl_evdev-success-v \
|
|
|
7a62b9 |
+ "${IOCTL_INJECT_START}" "${ret}"> "$EXP.$ret"
|
|
|
7a62b9 |
+ grep -v '^ioctl([012][,<]' < "$LOG" > "$OUT.$ret"
|
|
|
7a62b9 |
+ match_diff "$OUT.$ret" "$EXP.$ret"
|
|
|
7a62b9 |
+done
|
|
|
7a62b9 |
Index: strace-4.24/tests-mx32/ioctl_evdev-success.test
|
|
|
7a62b9 |
===================================================================
|
|
|
7a62b9 |
--- strace-4.24.orig/tests-mx32/ioctl_evdev-success.test 2019-08-01 18:40:58.009521546 +0200
|
|
|
7a62b9 |
+++ strace-4.24/tests-mx32/ioctl_evdev-success.test 2019-08-01 19:21:32.299062192 +0200
|
|
|
7a62b9 |
@@ -3,11 +3,14 @@
|
|
|
7a62b9 |
. "${srcdir=.}/scno_tampering.sh"
|
|
|
7a62b9 |
|
|
|
7a62b9 |
: ${IOCTL_INJECT_START=256}
|
|
|
7a62b9 |
-: ${IOCTL_INJECT_RETVAL=8}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
run_prog
|
|
|
7a62b9 |
-run_strace -a16 -e trace=ioctl \
|
|
|
7a62b9 |
- -e inject=ioctl:retval="${IOCTL_INJECT_RETVAL}":when="${IOCTL_INJECT_START}+" \
|
|
|
7a62b9 |
- ../ioctl_evdev-success "${IOCTL_INJECT_START}" "${IOCTL_INJECT_RETVAL}"> "$EXP"
|
|
|
7a62b9 |
-grep -v '^ioctl([012][,<]' < "$LOG" > "$OUT"
|
|
|
7a62b9 |
-match_diff "$OUT" "$EXP"
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
+for ret in 0 2 8 15 16; do
|
|
|
7a62b9 |
+ run_strace -a16 -e trace=ioctl \
|
|
|
7a62b9 |
+ -e inject=ioctl:retval="${ret}":when="${IOCTL_INJECT_START}+" \
|
|
|
7a62b9 |
+ ../ioctl_evdev-success \
|
|
|
7a62b9 |
+ "${IOCTL_INJECT_START}" "${ret}"> "$EXP.${ret}"
|
|
|
7a62b9 |
+ grep -v '^ioctl([012][,<]' < "$LOG" > "$OUT.$ret"
|
|
|
7a62b9 |
+ match_diff "$OUT.$ret" "$EXP.$ret"
|
|
|
7a62b9 |
+done
|
|
|
7a62b9 |
Index: strace-4.24/tests-m32/ioctl_evdev-success.c
|
|
|
7a62b9 |
===================================================================
|
|
|
7a62b9 |
--- strace-4.24.orig/tests-m32/ioctl_evdev-success.c 2019-08-01 18:40:58.009521546 +0200
|
|
|
7a62b9 |
+++ strace-4.24/tests-m32/ioctl_evdev-success.c 2019-08-29 12:09:27.898700830 +0200
|
|
|
7a62b9 |
@@ -2,6 +2,7 @@
|
|
|
7a62b9 |
|
|
|
7a62b9 |
#ifdef HAVE_LINUX_INPUT_H
|
|
|
7a62b9 |
|
|
|
7a62b9 |
+# include <assert.h>
|
|
|
7a62b9 |
# include <inttypes.h>
|
|
|
7a62b9 |
# include <stdio.h>
|
|
|
7a62b9 |
# include <stdlib.h>
|
|
|
7a62b9 |
@@ -9,17 +10,19 @@
|
|
|
7a62b9 |
# include <linux/input.h>
|
|
|
7a62b9 |
# include "print_fields.h"
|
|
|
7a62b9 |
|
|
|
7a62b9 |
+# define NUM_WORDS 4
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
static const char *errstr;
|
|
|
7a62b9 |
|
|
|
7a62b9 |
struct evdev_check {
|
|
|
7a62b9 |
unsigned long cmd;
|
|
|
7a62b9 |
const char *cmd_str;
|
|
|
7a62b9 |
- void *arg_ptr;
|
|
|
7a62b9 |
- void (*print_arg)(long rc, void *ptr, void *arg);
|
|
|
7a62b9 |
+ const void *arg_ptr;
|
|
|
7a62b9 |
+ void (*print_arg)(long rc, const void *ptr, const void *arg);
|
|
|
7a62b9 |
};
|
|
|
7a62b9 |
|
|
|
7a62b9 |
static long
|
|
|
7a62b9 |
-invoke_test_syscall(unsigned long cmd, void *p)
|
|
|
7a62b9 |
+invoke_test_syscall(unsigned long cmd, const void *p)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
long rc = ioctl(-1, cmd, p);
|
|
|
7a62b9 |
errstr = sprintrc(rc);
|
|
|
7a62b9 |
@@ -31,7 +34,7 @@
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
static void
|
|
|
7a62b9 |
-test_evdev(struct evdev_check *check, void *arg)
|
|
|
7a62b9 |
+test_evdev(struct evdev_check *check, const void *arg)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
long rc = invoke_test_syscall(check->cmd, check->arg_ptr);
|
|
|
7a62b9 |
printf("ioctl(-1, %s, ", check->cmd_str);
|
|
|
7a62b9 |
@@ -43,9 +46,9 @@
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
static void
|
|
|
7a62b9 |
-print_input_absinfo(long rc, void *ptr, void *arg)
|
|
|
7a62b9 |
+print_input_absinfo(long rc, const void *ptr, const void *arg)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
- struct input_absinfo *absinfo = ptr;
|
|
|
7a62b9 |
+ const struct input_absinfo *absinfo = ptr;
|
|
|
7a62b9 |
|
|
|
7a62b9 |
if (rc < 0) {
|
|
|
7a62b9 |
printf("%p", absinfo);
|
|
|
7a62b9 |
@@ -67,9 +70,9 @@
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
static void
|
|
|
7a62b9 |
-print_input_id(long rc, void *ptr, void *arg)
|
|
|
7a62b9 |
+print_input_id(long rc, const void *ptr, const void *arg)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
- struct input_id *id = ptr;
|
|
|
7a62b9 |
+ const struct input_id *id = ptr;
|
|
|
7a62b9 |
|
|
|
7a62b9 |
if (rc < 0) {
|
|
|
7a62b9 |
printf("%p", id);
|
|
|
7a62b9 |
@@ -84,10 +87,10 @@
|
|
|
7a62b9 |
|
|
|
7a62b9 |
# ifdef EVIOCGMTSLOTS
|
|
|
7a62b9 |
static void
|
|
|
7a62b9 |
-print_mtslots(long rc, void *ptr, void *arg)
|
|
|
7a62b9 |
+print_mtslots(long rc, const void *ptr, const void *arg)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
- int *buffer = ptr;
|
|
|
7a62b9 |
- const char **str = arg;
|
|
|
7a62b9 |
+ const int *buffer = ptr;
|
|
|
7a62b9 |
+ const char * const * str = arg;
|
|
|
7a62b9 |
int num = atoi(*(str + 1));
|
|
|
7a62b9 |
|
|
|
7a62b9 |
if (rc < 0) {
|
|
|
7a62b9 |
@@ -104,27 +107,26 @@
|
|
|
7a62b9 |
# endif
|
|
|
7a62b9 |
|
|
|
7a62b9 |
static void
|
|
|
7a62b9 |
-print_getbit(long rc, void *ptr, void *arg)
|
|
|
7a62b9 |
+print_getbit(long rc, const void *ptr, const void *arg)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
- const char **str = arg;
|
|
|
7a62b9 |
- int num = atoi(*str);
|
|
|
7a62b9 |
+ const char * const *str = arg;
|
|
|
7a62b9 |
|
|
|
7a62b9 |
- if (rc < 0) {
|
|
|
7a62b9 |
+ if (rc <= 0) {
|
|
|
7a62b9 |
printf("%p", ptr);
|
|
|
7a62b9 |
return;
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
printf("[");
|
|
|
7a62b9 |
- printf("%s", *(str + 1));
|
|
|
7a62b9 |
- for (unsigned int i = 2; i <= (unsigned) num; i++) {
|
|
|
7a62b9 |
+ for (unsigned long i = 0; str[i]; i++) {
|
|
|
7a62b9 |
# if ! VERBOSE
|
|
|
7a62b9 |
- if (i > 4) {
|
|
|
7a62b9 |
+ if (i >= 4) {
|
|
|
7a62b9 |
printf(", ...");
|
|
|
7a62b9 |
break;
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
# endif
|
|
|
7a62b9 |
- printf(", ");
|
|
|
7a62b9 |
- printf("%s", *(str + i));
|
|
|
7a62b9 |
+ if (i)
|
|
|
7a62b9 |
+ printf(", ");
|
|
|
7a62b9 |
+ printf("%s", str[i]);
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
printf("]");
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
@@ -170,6 +172,7 @@
|
|
|
7a62b9 |
TAIL_ALLOC_OBJECT_CONST_PTR(struct input_id, id);
|
|
|
7a62b9 |
TAIL_ALLOC_OBJECT_CONST_PTR(struct input_absinfo, absinfo);
|
|
|
7a62b9 |
TAIL_ALLOC_OBJECT_CONST_PTR(int, bad_addr_slot);
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
# ifdef EVIOCGMTSLOTS
|
|
|
7a62b9 |
int mtslots[] = { ABS_MT_SLOT, 1, 3 };
|
|
|
7a62b9 |
/* we use the second element to indicate the number of values */
|
|
|
7a62b9 |
@@ -183,36 +186,65 @@
|
|
|
7a62b9 |
const char *invalid_mtslot_str[] = { invalid_str, "1", "1" };
|
|
|
7a62b9 |
# endif
|
|
|
7a62b9 |
|
|
|
7a62b9 |
+ enum { ULONG_BIT = sizeof(unsigned long) * 8 };
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
/* set more than 4 bits */
|
|
|
7a62b9 |
- unsigned long ev_more[] = { 1 << EV_ABS | 1 << EV_MSC | 1 << EV_LED | 1 << EV_SND | 1 << EV_PWR };
|
|
|
7a62b9 |
- /* we use the first element to indicate the number of set bits */
|
|
|
7a62b9 |
- /* ev_more_str[0] is "5" so the number of set bits is 5 */
|
|
|
7a62b9 |
- const char *ev_more_str[] = { "5", "EV_ABS", "EV_MSC", "EV_LED", "EV_SND", "EV_PWR" };
|
|
|
7a62b9 |
+ static const unsigned long ev_more[NUM_WORDS] = {
|
|
|
7a62b9 |
+ 1 << EV_ABS | 1 << EV_MSC | 1 << EV_LED | 1 << EV_SND
|
|
|
7a62b9 |
+ | 1 << EV_PWR };
|
|
|
7a62b9 |
+ static const char * const ev_more_str_2[] = {
|
|
|
7a62b9 |
+ "EV_ABS", "EV_MSC", NULL };
|
|
|
7a62b9 |
+ static const char * const ev_more_str_3[] = {
|
|
|
7a62b9 |
+ "EV_ABS", "EV_MSC", "EV_LED", "EV_SND", "EV_PWR", NULL };
|
|
|
7a62b9 |
|
|
|
7a62b9 |
/* set less than 4 bits */
|
|
|
7a62b9 |
- unsigned long ev_less[] = { 1 << EV_ABS | 1 << EV_MSC | 1 << EV_LED };
|
|
|
7a62b9 |
- const char *ev_less_str[] = { "3", "EV_ABS", "EV_MSC", "EV_LED" };
|
|
|
7a62b9 |
+ static const unsigned long ev_less[NUM_WORDS] = {
|
|
|
7a62b9 |
+ 1 << EV_ABS | 1 << EV_MSC | 1 << EV_LED };
|
|
|
7a62b9 |
+ static const char * const ev_less_str_2[] = {
|
|
|
7a62b9 |
+ "EV_ABS", "EV_MSC", NULL };
|
|
|
7a62b9 |
+ static const char * const ev_less_str_3[] = {
|
|
|
7a62b9 |
+ "EV_ABS", "EV_MSC", "EV_LED", NULL };
|
|
|
7a62b9 |
|
|
|
7a62b9 |
/* set zero bit */
|
|
|
7a62b9 |
- unsigned long ev_zero[] = { 0x0 };
|
|
|
7a62b9 |
- const char *ev_zero_str[] = { "0", " 0 " };
|
|
|
7a62b9 |
+ static const unsigned long ev_zero[NUM_WORDS] = { 0x0 };
|
|
|
7a62b9 |
+ static const char * const ev_zero_str[] = { " 0 ", NULL };
|
|
|
7a62b9 |
|
|
|
7a62b9 |
/* KEY_MAX is 0x2ff which is greater than retval * 8 */
|
|
|
7a62b9 |
- unsigned long key[] = { 1 << KEY_1 | 1 << KEY_2, 0 };
|
|
|
7a62b9 |
- const char *key_str[] = { "2", "KEY_1", "KEY_2" };
|
|
|
7a62b9 |
+ static const unsigned long key[NUM_WORDS] = {
|
|
|
7a62b9 |
+ 1 << KEY_1 | 1 << KEY_2,
|
|
|
7a62b9 |
+ [ KEY_F12 / ULONG_BIT ] = 1 << (KEY_F12 % ULONG_BIT) };
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
+ static const char * const key_str_8[] = {
|
|
|
7a62b9 |
+ "KEY_1", "KEY_2", NULL };
|
|
|
7a62b9 |
+ static const char * const key_str_16[] = {
|
|
|
7a62b9 |
+ "KEY_1", "KEY_2", "KEY_F12", NULL };
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
+ assert(sizeof(ev_more) >= (unsigned long) inject_retval);
|
|
|
7a62b9 |
+ assert(sizeof(ev_less) >= (unsigned long) inject_retval);
|
|
|
7a62b9 |
+ assert(sizeof(ev_zero) >= (unsigned long) inject_retval);
|
|
|
7a62b9 |
+ assert(sizeof(key) >= (unsigned long) inject_retval);
|
|
|
7a62b9 |
|
|
|
7a62b9 |
struct {
|
|
|
7a62b9 |
struct evdev_check check;
|
|
|
7a62b9 |
- void *ptr;
|
|
|
7a62b9 |
+ const void *ptr;
|
|
|
7a62b9 |
} a[] = {
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGID), id, print_input_id }, NULL },
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGABS(ABS_X)), absinfo, print_input_absinfo }, NULL },
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGABS(ABS_Y)), absinfo, print_input_absinfo }, NULL },
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGABS(ABS_Y)), absinfo, print_input_absinfo }, NULL },
|
|
|
7a62b9 |
- { { ARG_STR(EVIOCGBIT(0, 0)), ev_more, print_getbit }, &ev_more_str },
|
|
|
7a62b9 |
- { { ARG_STR(EVIOCGBIT(0, 0)), ev_less, print_getbit }, &ev_less_str },
|
|
|
7a62b9 |
+ { { ARG_STR(EVIOCGBIT(0, 0)), ev_more, print_getbit },
|
|
|
7a62b9 |
+ inject_retval * 8 <= EV_LED
|
|
|
7a62b9 |
+ ? (const void *) &ev_more_str_2
|
|
|
7a62b9 |
+ : (const void *) &ev_more_str_3 },
|
|
|
7a62b9 |
+ { { ARG_STR(EVIOCGBIT(0, 0)), ev_less, print_getbit },
|
|
|
7a62b9 |
+ inject_retval * 8 <= EV_LED
|
|
|
7a62b9 |
+ ? (const void *) &ev_less_str_2
|
|
|
7a62b9 |
+ : (const void *) &ev_less_str_3 },
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGBIT(0, 0)), ev_zero, print_getbit }, &ev_zero_str },
|
|
|
7a62b9 |
- { { ARG_STR(EVIOCGBIT(EV_KEY, 0)), key, print_getbit }, &key_str},
|
|
|
7a62b9 |
+ { { ARG_STR(EVIOCGBIT(EV_KEY, 0)), key, print_getbit },
|
|
|
7a62b9 |
+ inject_retval * 8 <= KEY_F12
|
|
|
7a62b9 |
+ ? (const void *) &key_str_8
|
|
|
7a62b9 |
+ : (const void *) &key_str_16 },
|
|
|
7a62b9 |
# ifdef EVIOCGMTSLOTS
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGMTSLOTS(12)), mtslots, print_mtslots }, &mtslots_str },
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGMTSLOTS(8)), invalid_mtslot, print_mtslots }, &invalid_mtslot_str }
|
|
|
7a62b9 |
Index: strace-4.24/tests-mx32/ioctl_evdev-success.c
|
|
|
7a62b9 |
===================================================================
|
|
|
7a62b9 |
--- strace-4.24.orig/tests-mx32/ioctl_evdev-success.c 2019-08-01 18:40:58.009521546 +0200
|
|
|
7a62b9 |
+++ strace-4.24/tests-mx32/ioctl_evdev-success.c 2019-08-29 12:09:30.350669261 +0200
|
|
|
7a62b9 |
@@ -2,6 +2,7 @@
|
|
|
7a62b9 |
|
|
|
7a62b9 |
#ifdef HAVE_LINUX_INPUT_H
|
|
|
7a62b9 |
|
|
|
7a62b9 |
+# include <assert.h>
|
|
|
7a62b9 |
# include <inttypes.h>
|
|
|
7a62b9 |
# include <stdio.h>
|
|
|
7a62b9 |
# include <stdlib.h>
|
|
|
7a62b9 |
@@ -9,17 +10,19 @@
|
|
|
7a62b9 |
# include <linux/input.h>
|
|
|
7a62b9 |
# include "print_fields.h"
|
|
|
7a62b9 |
|
|
|
7a62b9 |
+# define NUM_WORDS 4
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
static const char *errstr;
|
|
|
7a62b9 |
|
|
|
7a62b9 |
struct evdev_check {
|
|
|
7a62b9 |
unsigned long cmd;
|
|
|
7a62b9 |
const char *cmd_str;
|
|
|
7a62b9 |
- void *arg_ptr;
|
|
|
7a62b9 |
- void (*print_arg)(long rc, void *ptr, void *arg);
|
|
|
7a62b9 |
+ const void *arg_ptr;
|
|
|
7a62b9 |
+ void (*print_arg)(long rc, const void *ptr, const void *arg);
|
|
|
7a62b9 |
};
|
|
|
7a62b9 |
|
|
|
7a62b9 |
static long
|
|
|
7a62b9 |
-invoke_test_syscall(unsigned long cmd, void *p)
|
|
|
7a62b9 |
+invoke_test_syscall(unsigned long cmd, const void *p)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
long rc = ioctl(-1, cmd, p);
|
|
|
7a62b9 |
errstr = sprintrc(rc);
|
|
|
7a62b9 |
@@ -31,7 +34,7 @@
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
static void
|
|
|
7a62b9 |
-test_evdev(struct evdev_check *check, void *arg)
|
|
|
7a62b9 |
+test_evdev(struct evdev_check *check, const void *arg)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
long rc = invoke_test_syscall(check->cmd, check->arg_ptr);
|
|
|
7a62b9 |
printf("ioctl(-1, %s, ", check->cmd_str);
|
|
|
7a62b9 |
@@ -43,9 +46,9 @@
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
static void
|
|
|
7a62b9 |
-print_input_absinfo(long rc, void *ptr, void *arg)
|
|
|
7a62b9 |
+print_input_absinfo(long rc, const void *ptr, const void *arg)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
- struct input_absinfo *absinfo = ptr;
|
|
|
7a62b9 |
+ const struct input_absinfo *absinfo = ptr;
|
|
|
7a62b9 |
|
|
|
7a62b9 |
if (rc < 0) {
|
|
|
7a62b9 |
printf("%p", absinfo);
|
|
|
7a62b9 |
@@ -67,9 +70,9 @@
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
static void
|
|
|
7a62b9 |
-print_input_id(long rc, void *ptr, void *arg)
|
|
|
7a62b9 |
+print_input_id(long rc, const void *ptr, const void *arg)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
- struct input_id *id = ptr;
|
|
|
7a62b9 |
+ const struct input_id *id = ptr;
|
|
|
7a62b9 |
|
|
|
7a62b9 |
if (rc < 0) {
|
|
|
7a62b9 |
printf("%p", id);
|
|
|
7a62b9 |
@@ -84,10 +87,10 @@
|
|
|
7a62b9 |
|
|
|
7a62b9 |
# ifdef EVIOCGMTSLOTS
|
|
|
7a62b9 |
static void
|
|
|
7a62b9 |
-print_mtslots(long rc, void *ptr, void *arg)
|
|
|
7a62b9 |
+print_mtslots(long rc, const void *ptr, const void *arg)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
- int *buffer = ptr;
|
|
|
7a62b9 |
- const char **str = arg;
|
|
|
7a62b9 |
+ const int *buffer = ptr;
|
|
|
7a62b9 |
+ const char * const * str = arg;
|
|
|
7a62b9 |
int num = atoi(*(str + 1));
|
|
|
7a62b9 |
|
|
|
7a62b9 |
if (rc < 0) {
|
|
|
7a62b9 |
@@ -104,27 +107,26 @@
|
|
|
7a62b9 |
# endif
|
|
|
7a62b9 |
|
|
|
7a62b9 |
static void
|
|
|
7a62b9 |
-print_getbit(long rc, void *ptr, void *arg)
|
|
|
7a62b9 |
+print_getbit(long rc, const void *ptr, const void *arg)
|
|
|
7a62b9 |
{
|
|
|
7a62b9 |
- const char **str = arg;
|
|
|
7a62b9 |
- int num = atoi(*str);
|
|
|
7a62b9 |
+ const char * const *str = arg;
|
|
|
7a62b9 |
|
|
|
7a62b9 |
- if (rc < 0) {
|
|
|
7a62b9 |
+ if (rc <= 0) {
|
|
|
7a62b9 |
printf("%p", ptr);
|
|
|
7a62b9 |
return;
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
|
|
|
7a62b9 |
printf("[");
|
|
|
7a62b9 |
- printf("%s", *(str + 1));
|
|
|
7a62b9 |
- for (unsigned int i = 2; i <= (unsigned) num; i++) {
|
|
|
7a62b9 |
+ for (unsigned long i = 0; str[i]; i++) {
|
|
|
7a62b9 |
# if ! VERBOSE
|
|
|
7a62b9 |
- if (i > 4) {
|
|
|
7a62b9 |
+ if (i >= 4) {
|
|
|
7a62b9 |
printf(", ...");
|
|
|
7a62b9 |
break;
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
# endif
|
|
|
7a62b9 |
- printf(", ");
|
|
|
7a62b9 |
- printf("%s", *(str + i));
|
|
|
7a62b9 |
+ if (i)
|
|
|
7a62b9 |
+ printf(", ");
|
|
|
7a62b9 |
+ printf("%s", str[i]);
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
printf("]");
|
|
|
7a62b9 |
}
|
|
|
7a62b9 |
@@ -170,6 +172,7 @@
|
|
|
7a62b9 |
TAIL_ALLOC_OBJECT_CONST_PTR(struct input_id, id);
|
|
|
7a62b9 |
TAIL_ALLOC_OBJECT_CONST_PTR(struct input_absinfo, absinfo);
|
|
|
7a62b9 |
TAIL_ALLOC_OBJECT_CONST_PTR(int, bad_addr_slot);
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
# ifdef EVIOCGMTSLOTS
|
|
|
7a62b9 |
int mtslots[] = { ABS_MT_SLOT, 1, 3 };
|
|
|
7a62b9 |
/* we use the second element to indicate the number of values */
|
|
|
7a62b9 |
@@ -183,36 +186,65 @@
|
|
|
7a62b9 |
const char *invalid_mtslot_str[] = { invalid_str, "1", "1" };
|
|
|
7a62b9 |
# endif
|
|
|
7a62b9 |
|
|
|
7a62b9 |
+ enum { ULONG_BIT = sizeof(unsigned long) * 8 };
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
/* set more than 4 bits */
|
|
|
7a62b9 |
- unsigned long ev_more[] = { 1 << EV_ABS | 1 << EV_MSC | 1 << EV_LED | 1 << EV_SND | 1 << EV_PWR };
|
|
|
7a62b9 |
- /* we use the first element to indicate the number of set bits */
|
|
|
7a62b9 |
- /* ev_more_str[0] is "5" so the number of set bits is 5 */
|
|
|
7a62b9 |
- const char *ev_more_str[] = { "5", "EV_ABS", "EV_MSC", "EV_LED", "EV_SND", "EV_PWR" };
|
|
|
7a62b9 |
+ static const unsigned long ev_more[NUM_WORDS] = {
|
|
|
7a62b9 |
+ 1 << EV_ABS | 1 << EV_MSC | 1 << EV_LED | 1 << EV_SND
|
|
|
7a62b9 |
+ | 1 << EV_PWR };
|
|
|
7a62b9 |
+ static const char * const ev_more_str_2[] = {
|
|
|
7a62b9 |
+ "EV_ABS", "EV_MSC", NULL };
|
|
|
7a62b9 |
+ static const char * const ev_more_str_3[] = {
|
|
|
7a62b9 |
+ "EV_ABS", "EV_MSC", "EV_LED", "EV_SND", "EV_PWR", NULL };
|
|
|
7a62b9 |
|
|
|
7a62b9 |
/* set less than 4 bits */
|
|
|
7a62b9 |
- unsigned long ev_less[] = { 1 << EV_ABS | 1 << EV_MSC | 1 << EV_LED };
|
|
|
7a62b9 |
- const char *ev_less_str[] = { "3", "EV_ABS", "EV_MSC", "EV_LED" };
|
|
|
7a62b9 |
+ static const unsigned long ev_less[NUM_WORDS] = {
|
|
|
7a62b9 |
+ 1 << EV_ABS | 1 << EV_MSC | 1 << EV_LED };
|
|
|
7a62b9 |
+ static const char * const ev_less_str_2[] = {
|
|
|
7a62b9 |
+ "EV_ABS", "EV_MSC", NULL };
|
|
|
7a62b9 |
+ static const char * const ev_less_str_3[] = {
|
|
|
7a62b9 |
+ "EV_ABS", "EV_MSC", "EV_LED", NULL };
|
|
|
7a62b9 |
|
|
|
7a62b9 |
/* set zero bit */
|
|
|
7a62b9 |
- unsigned long ev_zero[] = { 0x0 };
|
|
|
7a62b9 |
- const char *ev_zero_str[] = { "0", " 0 " };
|
|
|
7a62b9 |
+ static const unsigned long ev_zero[NUM_WORDS] = { 0x0 };
|
|
|
7a62b9 |
+ static const char * const ev_zero_str[] = { " 0 ", NULL };
|
|
|
7a62b9 |
|
|
|
7a62b9 |
/* KEY_MAX is 0x2ff which is greater than retval * 8 */
|
|
|
7a62b9 |
- unsigned long key[] = { 1 << KEY_1 | 1 << KEY_2, 0 };
|
|
|
7a62b9 |
- const char *key_str[] = { "2", "KEY_1", "KEY_2" };
|
|
|
7a62b9 |
+ static const unsigned long key[NUM_WORDS] = {
|
|
|
7a62b9 |
+ 1 << KEY_1 | 1 << KEY_2,
|
|
|
7a62b9 |
+ [ KEY_F12 / ULONG_BIT ] = 1 << (KEY_F12 % ULONG_BIT) };
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
+ static const char * const key_str_8[] = {
|
|
|
7a62b9 |
+ "KEY_1", "KEY_2", NULL };
|
|
|
7a62b9 |
+ static const char * const key_str_16[] = {
|
|
|
7a62b9 |
+ "KEY_1", "KEY_2", "KEY_F12", NULL };
|
|
|
7a62b9 |
+
|
|
|
7a62b9 |
+ assert(sizeof(ev_more) >= (unsigned long) inject_retval);
|
|
|
7a62b9 |
+ assert(sizeof(ev_less) >= (unsigned long) inject_retval);
|
|
|
7a62b9 |
+ assert(sizeof(ev_zero) >= (unsigned long) inject_retval);
|
|
|
7a62b9 |
+ assert(sizeof(key) >= (unsigned long) inject_retval);
|
|
|
7a62b9 |
|
|
|
7a62b9 |
struct {
|
|
|
7a62b9 |
struct evdev_check check;
|
|
|
7a62b9 |
- void *ptr;
|
|
|
7a62b9 |
+ const void *ptr;
|
|
|
7a62b9 |
} a[] = {
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGID), id, print_input_id }, NULL },
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGABS(ABS_X)), absinfo, print_input_absinfo }, NULL },
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGABS(ABS_Y)), absinfo, print_input_absinfo }, NULL },
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGABS(ABS_Y)), absinfo, print_input_absinfo }, NULL },
|
|
|
7a62b9 |
- { { ARG_STR(EVIOCGBIT(0, 0)), ev_more, print_getbit }, &ev_more_str },
|
|
|
7a62b9 |
- { { ARG_STR(EVIOCGBIT(0, 0)), ev_less, print_getbit }, &ev_less_str },
|
|
|
7a62b9 |
+ { { ARG_STR(EVIOCGBIT(0, 0)), ev_more, print_getbit },
|
|
|
7a62b9 |
+ inject_retval * 8 <= EV_LED
|
|
|
7a62b9 |
+ ? (const void *) &ev_more_str_2
|
|
|
7a62b9 |
+ : (const void *) &ev_more_str_3 },
|
|
|
7a62b9 |
+ { { ARG_STR(EVIOCGBIT(0, 0)), ev_less, print_getbit },
|
|
|
7a62b9 |
+ inject_retval * 8 <= EV_LED
|
|
|
7a62b9 |
+ ? (const void *) &ev_less_str_2
|
|
|
7a62b9 |
+ : (const void *) &ev_less_str_3 },
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGBIT(0, 0)), ev_zero, print_getbit }, &ev_zero_str },
|
|
|
7a62b9 |
- { { ARG_STR(EVIOCGBIT(EV_KEY, 0)), key, print_getbit }, &key_str},
|
|
|
7a62b9 |
+ { { ARG_STR(EVIOCGBIT(EV_KEY, 0)), key, print_getbit },
|
|
|
7a62b9 |
+ inject_retval * 8 <= KEY_F12
|
|
|
7a62b9 |
+ ? (const void *) &key_str_8
|
|
|
7a62b9 |
+ : (const void *) &key_str_16 },
|
|
|
7a62b9 |
# ifdef EVIOCGMTSLOTS
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGMTSLOTS(12)), mtslots, print_mtslots }, &mtslots_str },
|
|
|
7a62b9 |
{ { ARG_STR(EVIOCGMTSLOTS(8)), invalid_mtslot, print_mtslots }, &invalid_mtslot_str }
|