]> granicus.if.org Git - strace/commitdiff
Implement decoding of ustat syscall
authorJingPiao Chen <chenjingpiao@gmail.com>
Tue, 17 Jan 2017 07:55:58 +0000 (15:55 +0800)
committerDmitry V. Levin <ldv@altlinux.org>
Fri, 20 Jan 2017 18:30:11 +0000 (18:30 +0000)
* configure.ac (AC_CHECK_HEADERS): Add ustat.h.
* ustat.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* linux/dummy.h: Remove sys_ustat.
* tests/ustat.c: New file.
* tests/ustat.test: New test.
* tests/.gitignore: Add ustat.
* tests/Makefile.am (check_PROGRAMS): Likewise.
(DECODER_TESTS): Add ustat.test.

Makefile.am
configure.ac
linux/dummy.h
tests/.gitignore
tests/Makefile.am
tests/ustat.c [new file with mode: 0644]
tests/ustat.test [new file with mode: 0755]
ustat.c [new file with mode: 0644]

index a7d70066f2e9b64efa624c51ab656622b9b38b0a..9b00481da6d4f966880bb07a23c623e733098199 100644 (file)
@@ -250,6 +250,7 @@ strace_SOURCES =    \
        umount.c        \
        uname.c         \
        userfaultfd.c   \
+       ustat.c         \
        util.c          \
        utime.c         \
        utimes.c        \
index 793d74ef87245e240fadfbe2b13be13d3883458f..c439d5a9cbf413d644cc662ad00ed3cc84a3cc11 100644 (file)
@@ -394,6 +394,7 @@ AC_CHECK_HEADERS(m4_normalize([
        sys/shm.h
        sys/signalfd.h
        sys/xattr.h
+       ustat.h
 ]))
 
 AC_CHECK_HEADERS([asm/sigcontext.h],,, [#include <signal.h>])
index 0aee35b5aa7976106156c5493522b4ced2069ed0..2758cfb2978bd2b0a1a9d6c4400ca2d8c088df73 100644 (file)
 #define        sys_timerfd             printargs
 #define        sys_tuxcall             printargs
 #define        sys_ulimit              printargs
-#define        sys_ustat               printargs
 #define        sys_vserver             printargs
 
 /* deprecated */
index d06e3a51ad54cf684aad1c70c56ddaac36ff7e7b..fb063d61a76986469eef5cd97418840de7fb5704 100644 (file)
@@ -360,6 +360,7 @@ unlink
 unlinkat
 unshare
 userfaultfd
+ustat
 utime
 utimensat
 utimes
index 135a694e43c64103e808a75eeb546ccaeed0c43e..b06abb60ceadb3edbda011091744336fda8d7d90 100644 (file)
@@ -417,6 +417,7 @@ check_PROGRAMS = \
        unlinkat \
        unshare \
        userfaultfd \
+       ustat \
        utime \
        utimensat \
        utimes \
@@ -806,6 +807,7 @@ DECODER_TESTS = \
        unlinkat.test \
        unshare.test \
        userfaultfd.test \
+       ustat.test \
        utime.test \
        utimensat.test \
        utimes.test \
diff --git a/tests/ustat.c b/tests/ustat.c
new file mode 100644 (file)
index 0000000..57bb29c
--- /dev/null
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2017 JingPiao Chen <chenjingpiao@gmail.com>
+ * 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 <asm/unistd.h>
+
+#ifdef __NR_ustat
+
+# include <stdio.h>
+# include <sys/stat.h>
+# include <sys/sysmacros.h>
+# include <unistd.h>
+# ifdef HAVE_USTAT_H
+#  include <ustat.h>
+# endif
+
+int
+main(void)
+{
+       const kernel_ulong_t magic = (kernel_ulong_t) 0xfacefeedffffffff;
+       unsigned long long buf[4];
+       unsigned int dev;
+       long rc;
+
+# ifdef HAVE_USTAT_H
+       struct ustat *const ust = tail_alloc(sizeof(*ust));
+       struct stat st;
+       if (stat(".", &st))
+               perror_msg_and_fail("stat");
+
+       dev = (unsigned int) st.st_dev;
+       rc = syscall(__NR_ustat, dev, ust);
+       if (rc)
+               printf("ustat(makedev(%u, %u), %p) = %s\n",
+                      major(dev), minor(dev), ust, sprintrc(rc));
+       else
+               printf("ustat(makedev(%u, %u)"
+                      ", {f_tfree=%llu, f_tinode=%llu}) = 0\n",
+                      major(dev), minor(dev),
+                      zero_extend_signed_to_ull(ust->f_tfree),
+                      zero_extend_signed_to_ull(ust->f_tinode));
+# endif /* HAVE_USTAT_H */
+
+       dev = (unsigned int) magic;
+       rc = syscall(__NR_ustat, magic, 0);
+       printf("ustat(makedev(%u, %u), NULL) = %s\n",
+              major(dev), minor(dev), sprintrc(rc));
+
+       rc = syscall(__NR_ustat, magic, buf);
+       printf("ustat(makedev(%u, %u), %p) = %s\n",
+              major(dev), minor(dev), buf, sprintrc(rc));
+
+       puts("+++ exited with 0 +++");
+       return 0;
+}
+
+#else
+
+SKIP_MAIN_UNDEFINED("__NR_ustat")
+
+#endif
diff --git a/tests/ustat.test b/tests/ustat.test
new file mode 100755 (executable)
index 0000000..60a88e0
--- /dev/null
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Check ustat syscall decoding.
+
+. "${srcdir=.}/init.sh"
+run_strace_match_diff -a33
diff --git a/ustat.c b/ustat.c
new file mode 100644 (file)
index 0000000..7655063
--- /dev/null
+++ b/ustat.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2017 JingPiao Chen <chenjingpiao@gmail.com>
+ * 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"
+#ifdef HAVE_USTAT_H
+# include DEF_MPERS_TYPE(struct_ustat)
+# include <ustat.h>
+typedef struct ustat struct_ustat;
+#endif /* HAVE_USTAT_H */
+
+#include MPERS_DEFS
+
+SYS_FUNC(ustat)
+{
+       if (entering(tcp))
+               print_dev_t((unsigned int) tcp->u_arg[0]);
+       else {
+               tprints(", ");
+#ifdef HAVE_USTAT_H
+               struct_ustat ust;
+
+               if (!umove_or_printaddr(tcp, tcp->u_arg[1], &ust))
+                       tprintf("{f_tfree=%llu, f_tinode=%llu}",
+                               zero_extend_signed_to_ull(ust.f_tfree),
+                               zero_extend_signed_to_ull(ust.f_tinode));
+#else /* !HAVE_USTAT_H */
+               printaddr(tcp->u_arg[1]);
+#endif /* HAVE_USTAT_H */
+       }
+
+       return 0;
+}