Fix decoding of gettimeofday and settimeofday
* time.c (print_timezone): new function.
(sys_gettimeofday, sys_settimeofday): Use it instead of print_timeval
to print struct timezone.
[ALPHA] (sys_osf_gettimeofday, sys_osf_settimeofday): Use it
instead of print_timeval32 to print struct timezone.
* tests/xettimeofday.c: New file.
* tests/xettimeofday.test: New test.
* tests/Makefile.am (check_PROGRAMS): Add xettimeofday.
(TESTS): Add xettimeofday.
* tests/.gitignore: Add xettimeofday.
diff --git a/tests/.gitignore b/tests/.gitignore
index 485864d..6257468 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -71,6 +71,7 @@
xattr
xet_robust_list
xetitimer
+xettimeofday
*.log
*.log.*
*.o
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d94eac6..bc1157d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -84,6 +84,7 @@
xattr \
xet_robust_list \
xetitimer \
+ xettimeofday \
# end of check_PROGRAMS
clock_xettime_LDADD = -lrt
@@ -175,6 +176,7 @@
xattr.test \
xet_robust_list.test \
xetitimer.test \
+ xettimeofday.test \
count.test \
detach-sleeping.test \
detach-stopped.test \
diff --git a/tests/xettimeofday.c b/tests/xettimeofday.c
new file mode 100644
index 0000000..d36cac4
--- /dev/null
+++ b/tests/xettimeofday.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015 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 <stdint.h>
+#include <unistd.h>
+#include <sys/time.h>
+#include <sys/syscall.h>
+
+int
+main(void)
+{
+ struct {
+ struct timeval tv;
+ uint32_t pad0[2];
+ struct timezone tz;
+ uint32_t pad1[2];
+ } t = {
+ .pad0 = { 0xdeadbeef, 0xbadc0ded },
+ .pad1 = { 0xdeadbeef, 0xbadc0ded }
+ };
+
+ if (syscall(__NR_gettimeofday, &t.tv, NULL))
+ return 77;
+ printf("gettimeofday({%jd, %jd}, NULL) = 0\n",
+ (intmax_t) t.tv.tv_sec, (intmax_t) t.tv.tv_usec);
+
+ if (syscall(__NR_gettimeofday, &t.tv, &t.tz))
+ return 77;
+ printf("gettimeofday({%jd, %jd}"
+ ", {tz_minuteswest=%d, tz_dsttime=%d}) = 0\n",
+ (intmax_t) t.tv.tv_sec, (intmax_t) t.tv.tv_usec,
+ t.tz.tz_minuteswest, t.tz.tz_dsttime);
+
+ t.tv.tv_sec = -1;
+ t.tv.tv_usec = 1000000000;
+ if (!settimeofday(&t.tv, &t.tz))
+ return 77;
+ printf("settimeofday({%jd, %jd}"
+ ", {tz_minuteswest=%d, tz_dsttime=%d})"
+ " = -1 EINVAL (Invalid argument)\n",
+ (intmax_t) t.tv.tv_sec, (intmax_t) t.tv.tv_usec,
+ t.tz.tz_minuteswest, t.tz.tz_dsttime);
+
+ puts("+++ exited with 0 +++");
+ return 0;
+}
diff --git a/tests/xettimeofday.test b/tests/xettimeofday.test
new file mode 100755
index 0000000..dbebae3
--- /dev/null
+++ b/tests/xettimeofday.test
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Check gettimeofday and settimeofday syscalls decoding.
+
+. "${srcdir=.}/init.sh"
+
+run_prog > /dev/null
+OUT="$LOG.out"
+syscalls=gettimeofday,settimeofday
+run_strace -a20 -e trace=$syscalls $args > "$OUT"
+match_diff "$OUT" "$LOG"
+rm -f "$OUT"
+
+exit 0
diff --git a/time.c b/time.c
index 4dda0b3..209cb87 100644
--- a/time.c
+++ b/time.c
@@ -136,12 +136,24 @@
}
}
+static void
+print_timezone(struct tcb *tcp, const long addr)
+{
+ struct timezone tz;
+
+ if (umove_or_printaddr(tcp, addr, &tz))
+ return;
+
+ tprintf("{tz_minuteswest=%d, tz_dsttime=%d}",
+ tz.tz_minuteswest, tz.tz_dsttime);
+}
+
SYS_FUNC(gettimeofday)
{
if (exiting(tcp)) {
print_timeval(tcp, tcp->u_arg[0]);
tprints(", ");
- print_timeval(tcp, tcp->u_arg[1]);
+ print_timezone(tcp, tcp->u_arg[1]);
}
return 0;
}
@@ -152,7 +164,7 @@
if (exiting(tcp)) {
print_timeval32(tcp, tcp->u_arg[0]);
tprints(", ");
- print_timeval32(tcp, tcp->u_arg[1]);
+ print_timezone(tcp, tcp->u_arg[1]);
}
return 0;
}
@@ -162,7 +174,7 @@
{
print_timeval(tcp, tcp->u_arg[0]);
tprints(", ");
- print_timeval(tcp, tcp->u_arg[1]);
+ print_timezone(tcp, tcp->u_arg[1]);
return RVAL_DECODED;
}
@@ -172,7 +184,7 @@
{
print_timeval32(tcp, tcp->u_arg[0]);
tprints(", ");
- print_timeval32(tcp, tcp->u_arg[1]);
+ print_timezone(tcp, tcp->u_arg[1]);
return RVAL_DECODED;
}