Fix decoding of clock_nanosleep

* time.c (sys_clock_nanosleep): Use is_erestart,
temporarily_clear_syserror, and restore_cleared_syserror.
* tests/clock_nanosleep.c: New file.
* tests/clock_nanosleep.test: New test.
* tests/Makefile.am (check_PROGRAMS): Add clock_nanosleep.
(TESTS): Add clock_nanosleep.test.
* tests/.gitignore: Add clock_nanosleep.

diff --git a/tests/.gitignore b/tests/.gitignore
index aca8128968b7ea827046cc11260ef58e8111dfcf..485864d32f3b7bc7013822d610b175a72b2479c1 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -2,6 +2,7 @@ adjtimex
 aio
 bpf
 caps
+clock_nanosleep
 clock_xettime
 epoll_create1
 eventfd

diff --git a/tests/Makefile.am b/tests/Makefile.am
index dbe4511244bb91bb26eeeae90ac986734d6e45ba..d94eac6e3e03eda33e49ea6d465cd5cf180dbf17 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,6 +15,7 @@ check_PROGRAMS = \
        aio \
        bpf \
        caps \
+       clock_nanosleep \
        clock_xettime \
        epoll_create1 \
        eventfd \
@@ -105,6 +106,7 @@ TESTS = \
        aio.test \
        bpf.test \
        caps.test \
+       clock_nanosleep.test \
        clock_xettime.test \
        dumpio.test \
        epoll_create1.test \

diff --git a/tests/clock_nanosleep.c b/tests/clock_nanosleep.c
new file mode 100644 (file)
index 0000000..ff503c2
--- /dev/null
+++ b/tests/clock_nanosleep.c
@@ -0,0 +1,128 @@
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdint.h>
+#include <signal.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/time.h>
+#include <sys/syscall.h>
+
+static void
+handler(int signo)
+{
+}
+
+int
+main(void)
+{
+       struct {
+               struct timespec ts;
+               uint32_t pad[2];
+       } req = {
+               .ts = { .tv_nsec = 0xc0de1 },
+               .pad = { 0xdeadbeef, 0xbadc0ded }
+       }, rem = {
+               .ts = { .tv_sec = 0xc0de2, .tv_nsec = 0xc0de3 },
+               .pad = { 0xdeadbeef, 0xbadc0ded }
+       };
+       const sigset_t set = {};
+       const struct sigaction act = { .sa_handler = handler };
+       const struct itimerval itv = {
+               .it_interval.tv_usec = 222222,
+               .it_value.tv_usec = 111111
+       };
+
+       if (syscall(__NR_clock_nanosleep, CLOCK_REALTIME, 0, &req.ts, NULL))
+               return 77;
+       printf("clock_nanosleep(CLOCK_REALTIME, 0, {%jd, %jd}, NULL) = 0\n",
+              (intmax_t) req.ts.tv_sec, (intmax_t) req.ts.tv_nsec);
+
+       if (!syscall(__NR_clock_nanosleep, CLOCK_REALTIME, 0, NULL, &rem.ts))
+               return 77;
+       printf("clock_nanosleep(CLOCK_REALTIME, 0, NULL, %p)"
+              " = -1 EFAULT (Bad address)\n", &rem.ts);
+
+       if (syscall(__NR_clock_nanosleep, CLOCK_REALTIME, 0, &req.ts, &rem.ts))
+               return 77;
+       printf("clock_nanosleep(CLOCK_REALTIME, 0, {%jd, %jd}, %p) = 0\n",
+              (intmax_t) req.ts.tv_sec, (intmax_t) req.ts.tv_nsec, &rem.ts);
+
+       req.ts.tv_nsec = 999999999 + 1;
+       if (!syscall(__NR_clock_nanosleep, CLOCK_MONOTONIC, 0, &req.ts, &rem.ts))
+               return 77;
+       printf("clock_nanosleep(CLOCK_MONOTONIC, 0"
+              ", {%jd, %jd}, %p) = -1 EINVAL (Invalid argument)\n",
+              (intmax_t) req.ts.tv_sec, (intmax_t) req.ts.tv_nsec, &rem.ts);
+
+       if (sigaction(SIGALRM, &act, NULL))
+               return 77;
+       if (sigprocmask(SIG_SETMASK, &set, NULL))
+               return 77;
+
+       if (setitimer(ITIMER_REAL, &itv, NULL))
+               return 77;
+       printf("setitimer(ITIMER_REAL, {it_interval={%jd, %jd}"
+              ", it_value={%jd, %jd}}, NULL) = 0\n",
+              (intmax_t) itv.it_interval.tv_sec,
+              (intmax_t) itv.it_interval.tv_usec,
+              (intmax_t) itv.it_value.tv_sec,
+              (intmax_t) itv.it_value.tv_usec);
+
+       --req.ts.tv_nsec;
+       if (!syscall(__NR_clock_nanosleep, CLOCK_REALTIME, 0, &req.ts, &rem.ts))
+               return 77;
+       printf("clock_nanosleep(CLOCK_REALTIME, 0, {%jd, %jd}, {%jd, %jd})"
+              " = ? ERESTART_RESTARTBLOCK (Interrupted by signal)\n",
+              (intmax_t) req.ts.tv_sec, (intmax_t) req.ts.tv_nsec,
+              (intmax_t) rem.ts.tv_sec, (intmax_t) rem.ts.tv_nsec);
+       puts("--- SIGALRM {si_signo=SIGALRM, si_code=SI_KERNEL} ---");
+
+       if (syscall(__NR_clock_gettime, CLOCK_REALTIME, &req.ts))
+               return 77;
+       printf("clock_gettime(CLOCK_REALTIME, {%jd, %jd}) = 0\n",
+              (intmax_t) req.ts.tv_sec, (intmax_t) req.ts.tv_nsec);
+
+       ++req.ts.tv_sec;
+       rem.ts.tv_sec = 0xc0de4;
+       rem.ts.tv_nsec = 0xc0de5;
+       if (!syscall(__NR_clock_nanosleep, CLOCK_REALTIME, TIMER_ABSTIME,
+                    &req.ts, &rem.ts))
+               return 77;
+       printf("clock_nanosleep(CLOCK_REALTIME, TIMER_ABSTIME, {%jd, %jd}, %p)"
+              " = ? ERESTARTNOHAND (To be restarted if no handler)\n",
+              (intmax_t) req.ts.tv_sec, (intmax_t) req.ts.tv_nsec, &rem.ts);
+       puts("--- SIGALRM {si_signo=SIGALRM, si_code=SI_KERNEL} ---");
+
+       puts("+++ exited with 0 +++");
+       return 0;
+}

diff --git a/tests/clock_nanosleep.test b/tests/clock_nanosleep.test
new file mode 100755 (executable)
index 0000000..4245381
--- /dev/null
+++ b/tests/clock_nanosleep.test
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Check clock_nanosleep syscall decoding.
+
+. "${srcdir=.}/init.sh"
+
+run_prog > /dev/null
+OUT="$LOG.out"
+syscalls=clock_nanosleep,clock_gettime,setitimer
+run_strace -e trace=$syscalls $args > "$OUT"
+match_diff "$OUT" "$LOG"
+rm -f "$OUT"
+
+exit 0

diff --git a/time.c b/time.c
index 47023c590bcfff1ba017d0fcfcf75c1beb3cd38c..f93f150031d50dc37b03c3d43335629b22261ad7 100644 (file)
--- a/time.c
+++ b/time.c
@@ -351,7 +351,17 @@ SYS_FUNC(clock_nanosleep)
                printtv(tcp, tcp->u_arg[2]);
                tprints(", ");
        } else {
-               printtv(tcp, tcp->u_arg[3]);
+               /*
+                * Second (returned) timespec is only significant
+                * if syscall was interrupted and flags is not TIMER_ABSTIME.
+                */
+               if (!tcp->u_arg[1] && is_erestart(tcp)) {
+                       temporarily_clear_syserror(tcp);
+                       printtv(tcp, tcp->u_arg[3]);
+                       restore_cleared_syserror(tcp);
+               } else {
+                       printaddr(tcp->u_arg[3]);
+               }
        }
        return 0;
 }