glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

evdev.c: decode all directions except _IOC_READ on entering syscall

Browse Source 
* evdev.c (evdev_write_ioctl): Remove exiting check.
(evdev_read_ioctl): Move entering check ...
(evdev_ioctl): ... here.  Add RVAL_DECODED to return code in _IOC_WRITE
and default cases.
This commit is contained in:
Дмитрий Левин 2016-05-27 00:40:02 +00:00
parent 8d85c233d2
commit 2114e08a87
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
evdev.c
View File

@ -310,9 +310,6 @@ repeat_ioctl(struct tcb *tcp, long arg)
static int
evdev_read_ioctl(struct tcb *tcp, const unsigned int code, long arg)
{
if (entering(tcp))
return 1;
if (syserror(tcp))
return 0;
@ -425,9 +422,6 @@ evdev_read_ioctl(struct tcb *tcp, const unsigned int code, long arg)
static int
evdev_write_ioctl(struct tcb *tcp, const unsigned int code, long arg)
{
if (exiting(tcp))
return 1;
if ((_IOC_NR(code) & ~ABS_MAX) == _IOC_NR(EVIOCSABS(0)))
return abs_ioctl(tcp, arg);
@ -465,13 +459,13 @@ evdev_ioctl(struct tcb *tcp, const unsigned int code, long arg)
{
switch(_IOC_DIR(code)) {
case _IOC_READ:
if (entering(tcp))
return 0;
return evdev_read_ioctl(tcp, code, arg);
case _IOC_WRITE:
if (!evdev_write_ioctl(tcp, code, arg))
tprintf(", %lx", arg);
return 1;
return evdev_write_ioctl(tcp, code, arg) | RVAL_DECODED;
default:
return 0;
return RVAL_DECODED;
}
}