* tests/fanotify_mark.c (do_call): New function.
(main): Use it.
---
tests/fanotify_mark.c | 137 +++++++++++++++++++++++++++++++++++++++++++++-
tests/fanotify_mark.test | 2 +-
2 files changed, 135 insertions(+), 4 deletions(-)
diff --git a/tests/fanotify_mark.c b/tests/fanotify_mark.c
index a994c15..a4cb26d 100644
--- a/tests/fanotify_mark.c
+++ b/tests/fanotify_mark.c
@@ -1,24 +1,155 @@
#include "tests.h"
-#if defined HAVE_SYS_FANOTIFY_H && defined HAVE_FANOTIFY_MARK
+#include <asm/unistd.h>
+#if defined HAVE_SYS_FANOTIFY_H && defined HAVE_FANOTIFY_MARK && \
+ defined __NR_fanotify_mark
+
+# include <limits.h>
# include <stdio.h>
+# include <unistd.h>
+
# include <sys/fanotify.h>
+# include "kernel_types.h"
+
+/* Performs fanotify_mark call via the syscall interface. */
+static void
+do_call(kernel_ulong_t fd, kernel_ulong_t flags, const char *flags_str,
+ uint64_t mask, const char *mask_str, kernel_ulong_t dirfd,
+ const char *dirfd_str, kernel_ulong_t path, const char *path_str)
+{
+ long rc;
+
+ rc = syscall(__NR_fanotify_mark, fd, flags,
+# if (LONG_MAX > INT_MAX) \
+ || (defined __x86_64__ && defined __ILP32__) \
+ || defined LINUX_MIPSN32
+ mask,
+# else
+/* arch/parisc/kernel/sys_parisc32.c, commit ab8a261b */
+# ifdef HPPA
+ LL_VAL_TO_PAIR((mask << 32) | (mask >> 32)),
+# else
+ LL_VAL_TO_PAIR(mask),
+# endif
+# endif
+ dirfd, path);
+
+ printf("fanotify_mark(%d, %s, %s, %s, %s) = %s\n",
+ (int) fd, flags_str, mask_str, dirfd_str, path_str,
+ sprintrc(rc));
+}
+
+struct strval {
+ kernel_ulong_t val;
+ const char *str;
+};
+
+struct strval64 {
+ uint64_t val;
+ const char *str;
+};
+
+#define STR16 "0123456789abcdef"
+#define STR64 STR16 STR16 STR16 STR16
+
int
main(void)
{
- int rc = fanotify_mark(-1, FAN_MARK_ADD, FAN_MODIFY | FAN_ONDIR,
+ enum {
+ PATH1_SIZE = 64,
+ };
+
+ static const kernel_ulong_t fds[] = {
+ (kernel_ulong_t) 0xdeadfeed12345678ULL,
+ (kernel_ulong_t) 0xffffffff00000000ULL,
+ (kernel_ulong_t) 0xdeb0d1edffffffffULL,
+ };
+ static const struct strval flags[] = {
+ { (kernel_ulong_t) 0xffffffff00000000ULL, "0" },
+ { (kernel_ulong_t) 0xdec0deddefaced00ULL,
+ "0xefaced00 /* FAN_MARK_??? */" },
+ { (kernel_ulong_t) 0xda7a105700000040ULL,
+ "FAN_MARK_IGNORED_SURV_MODIFY" },
+ { (kernel_ulong_t) 0xbadc0deddeadfeedULL,
+ "FAN_MARK_ADD|FAN_MARK_DONT_FOLLOW|FAN_MARK_ONLYDIR|"
+ "FAN_MARK_IGNORED_MASK|FAN_MARK_IGNORED_SURV_MODIFY|"
+ "FAN_MARK_FLUSH|0xdeadfe00" },
+ };
+ static const struct strval64 masks[] = {
+ { ARG_ULL_STR(0) },
+ { 0xdeadfeedfacebeefULL,
+ "FAN_ACCESS|FAN_MODIFY|FAN_CLOSE_WRITE|FAN_OPEN|"
+ "FAN_ACCESS_PERM|FAN_ONDIR|FAN_EVENT_ON_CHILD|"
+ "0xdeadfeedb2ccbec4" },
+ { ARG_ULL_STR(0xffffffffb7fcbfc4) " /* FAN_??? */" },
+ };
+ static const struct strval dirfds[] = {
+ { (kernel_ulong_t) 0xfacefeed00000001ULL, "1" },
+ { (kernel_ulong_t) 0xdec0ded0ffffffffULL, "FAN_NOFD" },
+ { (kernel_ulong_t) 0xbadfacedffffff9cULL, "AT_FDCWD" },
+ { (kernel_ulong_t) 0xdefaced1beeff00dULL, "-1091571699" },
+ };
+ static const char str64[] = STR64;
+
+ static char bogus_path1_addr[sizeof("0x") + sizeof(void *) * 2];
+ static char bogus_path1_after_addr[sizeof("0x") + sizeof(void *) * 2];
+
+ char *bogus_path1 = tail_memdup(str64, PATH1_SIZE);
+ char *bogus_path2 = tail_memdup(str64, sizeof(str64));
+
+ struct strval paths[] = {
+ { (kernel_ulong_t) 0, "NULL" },
+ { (kernel_ulong_t) (uintptr_t) (bogus_path1 + PATH1_SIZE),
+ bogus_path1_after_addr },
+ { (kernel_ulong_t) (uintptr_t) bogus_path1, bogus_path1_addr },
+ { (kernel_ulong_t) (uintptr_t) bogus_path2, "\"" STR64 "\"" },
+ };
+
+ unsigned int i;
+ unsigned int j;
+ unsigned int k;
+ unsigned int l;
+ unsigned int m;
+ int rc;
+
+
+ snprintf(bogus_path1_addr, sizeof(bogus_path1_addr), "%p", bogus_path1);
+ snprintf(bogus_path1_after_addr, sizeof(bogus_path1_after_addr), "%p",
+ bogus_path1 + PATH1_SIZE);
+
+ rc = fanotify_mark(-1, FAN_MARK_ADD, FAN_MODIFY | FAN_ONDIR,
-100, ".");
printf("fanotify_mark(-1, FAN_MARK_ADD, FAN_MODIFY|FAN_ONDIR"
", AT_FDCWD, \".\") = %s\n", sprintrc(rc));
+ for (i = 0; i < ARRAY_SIZE(fds); i++) {
+ for (j = 0; j < ARRAY_SIZE(flags); j++) {
+ for (k = 0; k < ARRAY_SIZE(masks); k++) {
+ for (l = 0; l < ARRAY_SIZE(dirfds); l++) {
+ for (m = 0; m < ARRAY_SIZE(paths); m++)
+ do_call(fds[i],
+ flags[j].val,
+ flags[j].str,
+ masks[k].val,
+ masks[k].str,
+ dirfds[l].val,
+ dirfds[l].str,
+ paths[m].val,
+ paths[m].str);
+ }
+ }
+ }
+ }
+
puts("+++ exited with 0 +++");
return 0;
}
#else
-SKIP_MAIN_UNDEFINED("HAVE_SYS_FANOTIFY_H && HAVE_FANOTIFY_MARK")
+SKIP_MAIN_UNDEFINED("HAVE_SYS_FANOTIFY_H && HAVE_FANOTIFY_MARK && "
+ "__NR_fanotify_mark")
#endif
diff --git a/tests/fanotify_mark.test b/tests/fanotify_mark.test
index 84b3c83..fd67138 100755
--- a/tests/fanotify_mark.test
+++ b/tests/fanotify_mark.test
@@ -3,4 +3,4 @@
# Check decoding of fanotify_mark syscall.
. "${srcdir=.}/init.sh"
-run_strace_match_diff
+run_strace_match_diff -a32
--
1.7.10.4
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Strace-devel mailing list
Strace-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/strace-devel
