Fix decoding of statfs family syscalls

Fix decoders of fstatfs, fstatfs64, statfs, and statfs64 syscalls
by rewriting them using mpers infrastructure.

* fetch_struct_statfs.c: New file.
* fstatfs.c: Likewise.
* fstatfs64.c: Likewise.
* print_statfs.c: Likewise.
* statfs.h: Likewise.
* statfs64.c: Likewise.
* statfs.c: Remove everything except SYS_FUNC(statfs).
* configure.ac: Remove the check for struct statfs64 in <sys/vfs.h>.
Add checks for struct statfs and struct statfs64 in <asm/statfs.h>.
Add checks for f_frsize and f_flags members of these structures.
* defs.h (struct strace_statfs): New forward declaration.
(print_struct_statfs, print_struct_statfs64): New prototypes.
* Makefile.am (libstrace_a_SOURCES): Add fstatfs.c, fstatfs64.c,
statfs.c, and statfs64.c.
(strace_SOURCES): Add fetch_struct_statfs.c, print_statfs.c,
and statfs.h.
* NEWS: Mention this fix.
* tests/fstatfs.c: New file.
* tests/fstatfs64.c: Likewise.
* tests/statfs64.c: Likewise.
* tests/xstatfs.c: Likewise.
* tests/xstatfs64.c: Likewise.
* tests/xstatfsx.c: Likewise.
* tests/fstatfs.test: New test.
* tests/fstatfs64.test: Likewise.
* tests/statfs64.test: Likewise.
* tests/statfs.c: Rewrite using xstatfs.c.
* tests/statfs.test: Update.
* tests/.gitignore: Add fstatfs, fstatfs64, and statfs64.
* tests/Makefile.am (check_PROGRAMS): Likewise.
(DECODER_TESTS): Add  fstatfs.test, fstatfs64.test, and statfs64.test.
(EXTRA_DIST): Add xstatfs.c, xstatfs64.c, and xstatfsx.c.

1 files changed, 119 insertions, 0 deletions

diff --git a/tests/xstatfsx.c b/tests/xstatfsx.c
new file mode 100644
index 000000000..8e54fce52
--- /dev/null
+++ b/tests/xstatfsx.c
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
+ * 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 <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <linux/types.h>
+#include <asm/statfs.h>
+
+#include "xlat.h"
+#include "xlat/fsmagic.h"
+#include "xlat/statfs_flags.h"
+
+#define PRINT_NUM(arg)							\
+	if (sizeof(b->arg) == sizeof(int))				\
+		printf(", %s=%u", #arg, (unsigned int) b->arg);		\
+	else if (sizeof(b->arg) == sizeof(long))				\
+		printf(", %s=%lu", #arg, (unsigned long) b->arg);	\
+	else								\
+		printf(", %s=%llu", #arg, (unsigned long long) b->arg)
+
+static void
+print_statfs_type(const char *const prefix, const unsigned int magic)
+{
+	fputs(prefix, stdout);
+	unsigned int i;
+	for (i = 0; i < ARRAY_SIZE(fsmagic); ++i)
+		if (magic == fsmagic[i].val) {
+			fputs(fsmagic[i].str, stdout);
+			return;
+		}
+	printf("%#x", magic);
+}
+
+static void
+print_statfs(const char *const sample, const char *magic_str)
+{
+	int fd = open(sample, O_RDONLY);
+	if (fd < 0)
+		perror_msg_and_fail("open: %s", sample);
+
+	STRUCT_STATFS *const b = tail_alloc(sizeof(*b));
+	long rc = SYSCALL_INVOKE(sample, fd, b, sizeof(*b));
+	if (rc)
+		perror_msg_and_skip(SYSCALL_NAME);
+
+	PRINT_SYSCALL_HEADER(sample, fd, sizeof(*b));
+	if (magic_str)
+		printf("{f_type=%s", magic_str);
+	else
+		print_statfs_type("{f_type=", b->f_type);
+	PRINT_NUM(f_bsize);
+	PRINT_NUM(f_blocks);
+	PRINT_NUM(f_bfree);
+	PRINT_NUM(f_bavail);
+	PRINT_NUM(f_files);
+	PRINT_NUM(f_ffree);
+#ifdef PRINT_F_FSID
+	printf(", f_fsid={%u, %u}", b->PRINT_F_FSID[0], b->PRINT_F_FSID[1]);
+#endif
+	PRINT_NUM(f_namelen);
+#ifdef PRINT_F_FRSIZE
+	PRINT_NUM(f_frsize);
+#endif
+#ifdef PRINT_F_FLAGS
+	if (b->f_flags & ST_VALID) {
+		printf(", f_flags=");
+		printflags(statfs_flags, b->f_flags, "ST_???");
+	}
+#endif
+	printf("}) = 0\n");
+}
+
+int
+main(void)
+{
+	print_statfs("/proc/self/status", "PROC_SUPER_MAGIC");
+
+	print_statfs(".", NULL);
+
+	long rc = SYSCALL_INVOKE("", -1, 0, sizeof(STRUCT_STATFS));
+	PRINT_SYSCALL_HEADER("", -1, sizeof(STRUCT_STATFS));
+	printf("NULL) = %ld %s (%m)\n", rc, errno2name());
+
+#ifdef CHECK_ODD_SIZE
+	const unsigned long addr = (unsigned long) 0xfacefeeddeadbeef;
+	rc = SYSCALL_INVOKE("", -1, addr, sizeof(STRUCT_STATFS) + 1);
+	PRINT_SYSCALL_HEADER("", -1, sizeof(STRUCT_STATFS) + 1);
+	printf("%#lx) = %ld %s (%m)\n", addr, rc, errno2name());
+#endif
+
+	puts("+++ exited with 0 +++");
+	return 0;
+}