ioctl: implement INOTIFY_IOC_SETNEXTWD decoding

* inotify_ioctl.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* defs.h (DECL_IOCTL(inotify)): New declaration.
* ioctl.c (ioctl_decode) <case 'I'>: Call inotify_ioctl.
* tests/ioctl_inotify.c: New file.
* tests/.gitignore: Add ioctl_inotify.
* tests/pure_executables.list: Likewise.
* tests/gen_tests.in (ioctl_inotify): New test.
This commit is contained in:
Eugene Syromyatnikov 2018-05-18 19:16:17 +02:00 committed by Dmitry V. Levin
parent 597bfc6e1f
commit 07a4f1954a
8 changed files with 132 additions and 0 deletions

View File

@ -160,6 +160,7 @@ strace_SOURCES = \
hdio.c \
hostname.c \
inotify.c \
inotify_ioctl.c \
io.c \
ioctl.c \
ioperm.c \

1
defs.h
View File

@ -861,6 +861,7 @@ DECL_IOCTL(dm);
DECL_IOCTL(evdev);
DECL_IOCTL(file);
DECL_IOCTL(fs_x);
DECL_IOCTL(inotify);
DECL_IOCTL(kvm);
DECL_IOCTL(nsfs);
DECL_IOCTL(ptp);

48
inotify_ioctl.c Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright (c) 2018 The strace developers.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "defs.h"
#include <linux/ioctl.h>
#ifndef INOTIFY_IOC_SETNEXTWD
# define INOTIFY_IOC_SETNEXTWD _IOW('I', 0, int32_t)
#endif
int
inotify_ioctl(struct tcb *const tcp, const unsigned int code,
const kernel_ulong_t arg)
{
switch (code) {
case INOTIFY_IOC_SETNEXTWD:
tprintf(", %d", (int) arg);
return RVAL_IOCTL_DECODED;
}
return RVAL_DECODED;
}

View File

@ -322,6 +322,8 @@ ioctl_decode(struct tcb *tcp)
case 0xae:
return kvm_ioctl(tcp, code, arg);
#endif
case 'I':
return inotify_ioctl(tcp, code, arg);
default:
break;
}

1
tests/.gitignore vendored
View File

@ -136,6 +136,7 @@ ioctl_dm
ioctl_dm-v
ioctl_evdev
ioctl_evdev-v
ioctl_inotify
ioctl_kvm_run
ioctl_loop
ioctl_loop-nv

View File

@ -133,6 +133,7 @@ ioctl_dm +ioctl.test -s9
ioctl_dm-v +ioctl.test -v -s9
ioctl_evdev +ioctl.test
ioctl_evdev-v +ioctl.test -v
ioctl_inotify +ioctl.test
ioctl_kvm_run +ioctl.test -a36 -y
ioctl_loop +ioctl.test
ioctl_loop-nv +ioctl.test -a22 -e verbose=none

77
tests/ioctl_inotify.c Normal file
View File

@ -0,0 +1,77 @@
/*
* This file is part of ioctl_inotify strace test.
*
* Copyright (c) 2018 The strace developers.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "tests.h"
#include <inttypes.h>
#include <stdio.h>
#include <string.h>
#include <linux/ioctl.h>
#include <sys/ioctl.h>
#include <sys/sysmacros.h>
#ifndef INOTIFY_IOC_SETNEXTWD
# define INOTIFY_IOC_SETNEXTWD _IOW('I', 0, int32_t)
#endif
int
main(void)
{
static const kernel_ulong_t unknown_inotify_cmd =
(kernel_ulong_t) 0xbadc0dedfeed49edULL;
static const kernel_ulong_t magic =
(kernel_ulong_t) 0xdeadbeefbadc0dedULL;
/* Unknown inotify commands */
ioctl(-1, unknown_inotify_cmd, magic);
printf("ioctl(-1, _IOC(_IOC_READ|_IOC_WRITE%s, 0x49, %#x, %#x), "
"%#lx) = -1 EBADF (%m)\n",
_IOC_DIR((unsigned int) unknown_inotify_cmd) & _IOC_NONE ?
"|_IOC_NONE" : "",
_IOC_NR((unsigned int) unknown_inotify_cmd),
_IOC_SIZE((unsigned int) unknown_inotify_cmd),
(unsigned long) magic);
ioctl(-1, INOTIFY_IOC_SETNEXTWD + 1, magic);
printf("ioctl(-1, _IOC(_IOC_WRITE, 0x49, %#x, %#x), %#lx)"
" = -1 EBADF (%m)\n",
(unsigned int) _IOC_NR(INOTIFY_IOC_SETNEXTWD + 1),
(unsigned int) _IOC_SIZE(INOTIFY_IOC_SETNEXTWD + 1),
(unsigned long) magic);
/* INOTIFY_IOC_SETNEXTWD */
ioctl(-1, INOTIFY_IOC_SETNEXTWD, magic);
printf("ioctl(-1, INOTIFY_IOC_SETNEXTWD, %d) = -1 EBADF (%m)\n",
(int) magic);
puts("+++ exited with 0 +++");
return 0;
}

View File

@ -107,6 +107,7 @@ ioctl
ioctl_block
ioctl_dm
ioctl_evdev
ioctl_inotify
ioctl_kvm_run
ioctl_loop
ioctl_mtd