[ 79] = { 2, 0, SEN(settimeofday), "settimeofday" },
[ 80] = { 2, 0, SEN(getgroups16), "getgroups" },
[ 81] = { 2, 0, SEN(setgroups16), "setgroups" },
-[ 82] = { 1, TD, SEN(oldselect), "oldselect" },
+[ 82] = { 1, TD, SEN(oldselect), "select" },
[ 83] = { 2, TF, SEN(symlink), "symlink" },
[ 84] = { 2, TF, SEN(oldlstat), "oldlstat" },
[ 85] = { 3, TF, SEN(readlink), "readlink" },
[139] = { 1, NF, SEN(setfsgid16), "setfsgid" },
[140] = { 5, TD, SEN(llseek), "_llseek" },
[141] = { 3, TD, SEN(getdents), "getdents" },
-[142] = { 5, TD, SEN(select), "select" },
+[142] = { 5, TD, SEN(select), "_newselect" },
[143] = { 2, TD, SEN(flock), "flock" },
[144] = { 3, TM, SEN(msync), "msync" },
[145] = { 3, TD, SEN(readv), "readv" },
[ 79] = { 2, 0, SEN(settimeofday), "settimeofday" },
[ 80] = { 2, 0, SEN(getgroups16), "getgroups" },
[ 81] = { 2, 0, SEN(setgroups16), "setgroups" },
-[ 82] = { 1, TD, SEN(oldselect), "oldselect" },
+[ 82] = { 1, TD, SEN(oldselect), "select" },
[ 83] = { 2, TF, SEN(symlink), "symlink" },
[ 84] = { 2, TF, SEN(oldlstat), "oldlstat" },
[ 85] = { 3, TF, SEN(readlink), "readlink" },
[139] = { 1, NF, SEN(setfsgid16), "setfsgid" },
[140] = { 5, TD, SEN(llseek), "_llseek" },
[141] = { 3, TD, SEN(getdents), "getdents" },
-[142] = { 5, TD, SEN(select), "select" },
+[142] = { 5, TD, SEN(select), "_newselect" },
[143] = { 2, TD, SEN(flock), "flock" },
[144] = { 3, TM, SEN(msync), "msync" },
[145] = { 3, TD, SEN(readv), "readv" },
[139] = { 1, NF, SEN(setfsgid), "setfsgid" },
[140] = { 5, TD, SEN(llseek), "_llseek" },
[141] = { 3, TD, SEN(getdents), "getdents" },
-[142] = { 5, TD, SEN(select), "select" },
+[142] = { 5, TD, SEN(select), "_newselect" },
[143] = { 2, TD, SEN(flock), "flock" },
[144] = { 3, TM, SEN(msync), "msync" },
[145] = { 3, TD, SEN(readv), "readv" },
[ 79] = { 2, 0, SEN(settimeofday), "settimeofday" },
[ 80] = { 2, 0, SEN(getgroups16), "getgroups" },
[ 81] = { 2, 0, SEN(setgroups16), "setgroups" },
-[ 82] = { 1, TD, SEN(oldselect), "oldselect" },
+[ 82] = { 1, TD, SEN(oldselect), "select" },
[ 83] = { 2, TF, SEN(symlink), "symlink" },
[ 84] = { 2, TF, SEN(oldlstat), "oldlstat" },
[ 85] = { 3, TF, SEN(readlink), "readlink" },
[139] = { 1, NF, SEN(setfsgid16), "setfsgid" },
[140] = { 5, TD, SEN(llseek), "_llseek" },
[141] = { 3, TD, SEN(getdents), "getdents" },
-[142] = { 5, TD, SEN(select), "select" },
+[142] = { 5, TD, SEN(select), "_newselect" },
[143] = { 2, TD, SEN(flock), "flock" },
[144] = { 3, TM, SEN(msync), "msync" },
[145] = { 3, TD, SEN(readv), "readv" },
[ 79] = { 2, 0, SEN(settimeofday), "settimeofday" },
[ 80] = { 2, 0, SEN(getgroups16), "getgroups" },
[ 81] = { 2, 0, SEN(setgroups16), "setgroups" },
-[ 82] = { 1, TD, SEN(oldselect), "oldselect" },
+[ 82] = { 1, TD, SEN(oldselect), "select" },
[ 83] = { 2, TF, SEN(symlink), "symlink" },
[ 84] = { 2, TF, SEN(oldlstat), "oldlstat" },
[ 85] = { 3, TF, SEN(readlink), "readlink" },
[139] = { 1, NF, SEN(setfsgid16), "setfsgid" },
[140] = { 5, TD, SEN(llseek), "_llseek" },
[141] = { 3, TD, SEN(getdents), "getdents" },
-[142] = { 5, TD, SEN(select), "select" },
+[142] = { 5, TD, SEN(select), "_newselect" },
[143] = { 2, TD, SEN(flock), "flock" },
[144] = { 3, TM, SEN(msync), "msync" },
[145] = { 3, TD, SEN(readv), "readv" },
[ 79] = { 2, 0, SEN(settimeofday), "settimeofday" },
[ 80] = { 2, 0, SEN(getgroups16), "getgroups" },
[ 81] = { 2, 0, SEN(setgroups16), "setgroups" },
-[ 82] = { 1, TD, SEN(oldselect), "oldselect" },
+[ 82] = { 1, TD, SEN(oldselect), "select" },
[ 83] = { 2, TF, SEN(symlink), "symlink" },
[ 84] = { 2, TF, SEN(oldlstat), "oldlstat" },
[ 85] = { 3, TF, SEN(readlink), "readlink" },
[139] = { 1, NF, SEN(setfsgid16), "setfsgid" },
[140] = { 5, TD, SEN(llseek), "_llseek" },
[141] = { 3, TD, SEN(getdents), "getdents" },
-[142] = { 5, TD, SEN(select), "select" },
+[142] = { 5, TD, SEN(select), "_newselect" },
[143] = { 2, TD, SEN(flock), "flock" },
[144] = { 3, TM, SEN(msync), "msync" },
[145] = { 3, TD, SEN(readv), "readv" },
[6019] = { 3, TD, SEN(writev), "writev" },
[6020] = { 2, TF, SEN(access), "access" },
[6021] = { 1, TD, SEN(pipe), "pipe" },
-[6022] = { 5, TD, SEN(select), "select" },
+[6022] = { 5, TD, SEN(select), "_newselect" },
[6023] = { 0, 0, SEN(sched_yield), "sched_yield" },
[6024] = { 5, TM|SI, SEN(mremap), "mremap" },
[6025] = { 3, TM, SEN(msync), "msync" },
[5019] = { 3, TD, SEN(writev), "writev" },
[5020] = { 2, TF, SEN(access), "access" },
[5021] = { 1, TD, SEN(pipe), "pipe" },
-[5022] = { 5, TD, SEN(select), "select" },
+[5022] = { 5, TD, SEN(select), "_newselect" },
[5023] = { 0, 0, SEN(sched_yield), "sched_yield" },
[5024] = { 5, TM|SI, SEN(mremap), "mremap" },
[5025] = { 3, TM, SEN(msync), "msync" },
[4139] = { 1, NF, SEN(setfsgid), "setfsgid" },
[4140] = { 5, TD, SEN(llseek), "_llseek" },
[4141] = { 3, TD, SEN(getdents), "getdents" },
-[4142] = { 5, TD, SEN(select), "select" },
+[4142] = { 5, TD, SEN(select), "_newselect" },
[4143] = { 2, TD, SEN(flock), "flock" },
[4144] = { 3, TM, SEN(msync), "msync" },
[4145] = { 3, TD, SEN(readv), "readv" },
[ 79] = { 2, 0, SEN(settimeofday), "settimeofday" },
[ 80] = { 2, 0, SEN(getgroups), "getgroups" },
[ 81] = { 2, 0, SEN(setgroups), "setgroups" },
-[ 82] = { 1, TD, SEN(oldselect), "oldselect" },
+[ 82] = { 1, TD, SEN(oldselect), "select" },
[ 83] = { 2, TF, SEN(symlink), "symlink" },
[ 84] = { 2, TF, SEN(oldlstat), "oldlstat" },
[ 85] = { 3, TF, SEN(readlink), "readlink" },
[139] = { 1, NF, SEN(setfsgid), "setfsgid" },
[140] = { 5, TD, SEN(llseek), "_llseek" },
[141] = { 3, TD, SEN(getdents), "getdents" },
-[142] = { 5, TD, SEN(select), "select" },
+[142] = { 5, TD, SEN(select), "_newselect" },
[143] = { 2, TD, SEN(flock), "flock" },
[144] = { 3, TM, SEN(msync), "msync" },
[145] = { 3, TD, SEN(readv), "readv" },
[ 79] = { 2, 0, SEN(settimeofday), "settimeofday" },
[ 80] = { 2, 0, SEN(getgroups), "getgroups" },
[ 81] = { 2, 0, SEN(setgroups), "setgroups" },
-[ 82] = { 1, TD, SEN(oldselect), "oldselect" },
+[ 82] = { 1, TD, SEN(oldselect), "select" },
[ 83] = { 2, TF, SEN(symlink), "symlink" },
[ 84] = { 2, TF, SEN(oldlstat), "oldlstat" },
[ 85] = { 3, TF, SEN(readlink), "readlink" },
[139] = { 1, NF, SEN(setfsgid), "setfsgid" },
[140] = { 5, TD, SEN(llseek), "_llseek" },
[141] = { 3, TD, SEN(getdents), "getdents" },
-[142] = { 5, TD, SEN(select), "select" },
+[142] = { 5, TD, SEN(select), "_newselect" },
[143] = { 2, TD, SEN(flock), "flock" },
[144] = { 3, TM, SEN(msync), "msync" },
[145] = { 3, TD, SEN(readv), "readv" },
[139] = { 1, NF, SEN(setfsgid16), "setfsgid" },
[140] = { 5, TD, SEN(llseek), "_llseek" },
[141] = { 3, TD, SEN(getdents), "getdents" },
-[142] = { 5, TD, SEN(select), "select" },
+[142] = { 5, TD, SEN(select), "_newselect" },
[143] = { 2, TD, SEN(flock), "flock" },
[144] = { 3, TM, SEN(msync), "msync" },
[145] = { 3, TD, SEN(readv), "readv" },
[ 79] = { 2, 0, SEN(settimeofday), "settimeofday" },
[ 80] = { 2, 0, SEN(getgroups16), "getgroups" },
[ 81] = { 2, 0, SEN(setgroups16), "setgroups" },
-[ 82] = { 1, TD, SEN(oldselect), "oldselect" },
+[ 82] = { 1, TD, SEN(oldselect), "select" },
[ 83] = { 2, TF, SEN(symlink), "symlink" },
[ 84] = { 2, TF, SEN(oldlstat), "oldlstat" },
[ 85] = { 3, TF, SEN(readlink), "readlink" },
[139] = { 1, NF, SEN(setfsgid16), "setfsgid" },
[140] = { 5, TD, SEN(llseek), "_llseek" },
[141] = { 3, TD, SEN(getdents), "getdents" },
-[142] = { 5, TD, SEN(select), "select" },
+[142] = { 5, TD, SEN(select), "_newselect" },
[143] = { 2, TD, SEN(flock), "flock" },
[144] = { 3, TM, SEN(msync), "msync" },
[145] = { 3, TD, SEN(readv), "readv" },
[139] = { 1, NF, SEN(setfsgid16), "setfsgid" },
[140] = { 5, TD, SEN(llseek), "_llseek" },
[141] = { 3, TD, SEN(getdents), "getdents" },
-[142] = { 5, TD, SEN(select), "select" },
+[142] = { 5, TD, SEN(select), "_newselect" },
[143] = { 2, TD, SEN(flock), "flock" },
[144] = { 3, TM, SEN(msync), "msync" },
[145] = { 3, TD, SEN(readv), "readv" },
[227] = { 5, 0, SEN(afs_syscall), "afs_syscall" },
[228] = { 1, NF, SEN(setfsuid16), "setfsuid" },
[229] = { 1, NF, SEN(setfsgid16), "setfsgid" },
-[230] = { 5, TD, SEN(select), "select" },
+[230] = { 5, TD, SEN(select), "_newselect" },
[231] = { 1, 0, SEN(time), "time" },
[232] = { 6, TD, SEN(splice), "splice" },
[233] = { 1, 0, SEN(stime), "stime" },
*.tmp-*
*.tmp.*
*.trs
+_newselect
adjtimex
aio
bpf
AM_LDFLAGS = $(ARCH_MFLAGS)
check_PROGRAMS = \
+ _newselect \
adjtimex \
aio \
bpf \
strace-f.test \
qual_syscall.test \
\
+ _newselect.test \
adjtimex.test \
aio.test \
bexecve.test \
unix-yy-connect.awk \
wait.expected \
xattr.expected \
+ xselect.c \
xstatx.c \
$(TESTS)
--- /dev/null
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <sys/syscall.h>
+
+#undef TEST_SYSCALL_NAME
+#ifdef __NR__newselect
+# define TEST_SYSCALL_NAME _newselect
+#endif
+
+#include "xselect.c"
--- /dev/null
+#!/bin/sh
+
+# Check _newselect syscall decoding.
+
+. "${srcdir=.}/select.test"
-oldselect\(2, \[1\], \[0\], NULL, \{0, 42\}\) += 0 \(Timeout\)
+select(2, [1], [0], NULL, {0, 42}) = 0 (Timeout)
++++ exited with 0 +++
#!/bin/sh
-# Check oldselect syscall decoding.
+# Check old select syscall decoding.
. "${srcdir=.}/init.sh"
run_prog
-run_strace -e oldselect $args
-match_grep
+run_strace -a34 -eselect $args
+match_diff
exit 0
-/*
- * 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
-/*
- * Based on test by Dr. David Alan Gilbert <dave@treblig.org>
- */
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/select.h>
#include <sys/syscall.h>
-#undef NR_select
-
-#if defined __NR__newselect
-# define NR_select __NR__newselect
-#elif defined __NR_select
-# define NR_select __NR_select
+#undef TEST_SYSCALL_NAME
+#if defined __NR_select && !defined __NR__newselect
+# define TEST_SYSCALL_NAME select
#endif
-#ifdef NR_select
-
-static fd_set set[0x1000000 / sizeof(fd_set)];
-
-int main(void)
-{
- int fds[2];
- struct {
- struct timeval tv;
- int pad[2];
- } tm_in = {
- .tv = { .tv_sec = 0xc0de1, .tv_usec = 0xc0de2 },
- .pad = { 0xdeadbeef, 0xbadc0ded }
- }, tm = tm_in;
-
- if (pipe(fds))
- return 77;
-
- /*
- * Start with a nice simple select.
- */
- FD_ZERO(set);
- FD_SET(fds[0], set);
- FD_SET(fds[1], set);
- if (syscall(NR_select, fds[1] + 1, set, set, set, NULL) != 1)
- return 77;
- printf("select(%d, [%d %d], [%d %d], [%d %d], NULL) = 1 ()\n",
- fds[1] + 1, fds[0], fds[1],
- fds[0], fds[1], fds[0], fds[1]);
-
- /*
- * Another simple one, with a timeout.
- */
- FD_SET(1, set);
- FD_SET(2, set);
- FD_SET(fds[0], set);
- FD_SET(fds[1], set);
- if (syscall(NR_select, fds[1] + 1, NULL, set, NULL, &tm.tv) != 3)
- return 77;
- printf("select(%d, NULL, [1 2 %d %d], NULL, {%Ld, %Ld})"
- " = 3 (out [1 2 %d], left {%Ld, %Ld})\n",
- fds[1] + 1, fds[0], fds[1],
- (long long) tm_in.tv.tv_sec, (long long) tm_in.tv.tv_usec,
- fds[1],
- (long long) tm.tv.tv_sec, (long long) tm.tv.tv_usec);
-
- /*
- * Now the crash case that trinity found, negative nfds
- * but with a pointer to a large chunk of valid memory.
- */
- FD_ZERO(set);
- FD_SET(fds[1],set);
- if (syscall(NR_select, -1, NULL, set, NULL, NULL) != -1)
- return 77;
- printf("select(-1, NULL, %p, NULL, NULL) "
- "= -1 EINVAL (Invalid argument)\n", set);
-
- /*
- * Another variant, with nfds exceeding FD_SETSIZE limit.
- */
- FD_ZERO(set);
- FD_SET(fds[0],set);
- tm.tv.tv_sec = 0;
- tm.tv.tv_usec = 123;
- if (syscall(NR_select, FD_SETSIZE + 1, set, set + 1, NULL, &tm.tv))
- return 77;
- printf("select(%d, [%d], [], NULL, {0, 123}) = 0 (Timeout)\n",
- FD_SETSIZE + 1, fds[0]);
-
- puts("+++ exited with 0 +++");
- return 0;
-}
-
-#else
-
-int
-main(void)
-{
- return 77;
-}
-
-#endif
+#include "xselect.c"
. "${srcdir=.}/init.sh"
run_prog > /dev/null
+syscall=${ME_%.test}
OUT="$LOG.out"
-run_strace -a36 -eselect $args > "$OUT"
+run_strace -a36 -e$syscall $args > "$OUT"
match_diff "$LOG" "$OUT"
rm -f "$OUT"
--- /dev/null
+/*
+ * 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.
+ */
+
+/*
+ * Based on test by Dr. David Alan Gilbert <dave@treblig.org>
+ */
+
+#ifdef TEST_SYSCALL_NAME
+
+# include <stdio.h>
+# include <unistd.h>
+# include <sys/select.h>
+
+# define TEST_SYSCALL_NR nrify(TEST_SYSCALL_NAME)
+# define nrify(arg) nrify_(arg)
+# define nrify_(arg) __NR_ ## arg
+
+# define TEST_SYSCALL_STR stringify(TEST_SYSCALL_NAME)
+# define stringify(arg) stringify_(arg)
+# define stringify_(arg) #arg
+
+static fd_set set[0x1000000 / sizeof(fd_set)];
+
+int main(void)
+{
+ int fds[2];
+ struct {
+ struct timeval tv;
+ int pad[2];
+ } tm_in = {
+ .tv = { .tv_sec = 0xc0de1, .tv_usec = 0xc0de2 },
+ .pad = { 0xdeadbeef, 0xbadc0ded }
+ }, tm = tm_in;
+
+ if (pipe(fds))
+ return 77;
+
+ /*
+ * Start with a nice simple select.
+ */
+ FD_ZERO(set);
+ FD_SET(fds[0], set);
+ FD_SET(fds[1], set);
+ if (syscall(TEST_SYSCALL_NR, fds[1] + 1, set, set, set, NULL) != 1)
+ return 77;
+ printf("%s(%d, [%d %d], [%d %d], [%d %d], NULL) = 1 ()\n",
+ TEST_SYSCALL_STR, fds[1] + 1, fds[0], fds[1],
+ fds[0], fds[1], fds[0], fds[1]);
+
+ /*
+ * Another simple one, with a timeout.
+ */
+ FD_SET(1, set);
+ FD_SET(2, set);
+ FD_SET(fds[0], set);
+ FD_SET(fds[1], set);
+ if (syscall(TEST_SYSCALL_NR, fds[1] + 1, NULL, set, NULL, &tm.tv) != 3)
+ return 77;
+ printf("%s(%d, NULL, [1 2 %d %d], NULL, {%Ld, %Ld})"
+ " = 3 (out [1 2 %d], left {%Ld, %Ld})\n",
+ TEST_SYSCALL_STR, fds[1] + 1, fds[0], fds[1],
+ (long long) tm_in.tv.tv_sec, (long long) tm_in.tv.tv_usec,
+ fds[1],
+ (long long) tm.tv.tv_sec, (long long) tm.tv.tv_usec);
+
+ /*
+ * Now the crash case that trinity found, negative nfds
+ * but with a pointer to a large chunk of valid memory.
+ */
+ FD_ZERO(set);
+ FD_SET(fds[1],set);
+ if (syscall(TEST_SYSCALL_NR, -1, NULL, set, NULL, NULL) != -1)
+ return 77;
+ printf("%s(-1, NULL, %p, NULL, NULL) = -1 EINVAL (%m)\n",
+ TEST_SYSCALL_STR, set);
+
+ /*
+ * Another variant, with nfds exceeding FD_SETSIZE limit.
+ */
+ FD_ZERO(set);
+ FD_SET(fds[0],set);
+ tm.tv.tv_sec = 0;
+ tm.tv.tv_usec = 123;
+ if (syscall(TEST_SYSCALL_NR, FD_SETSIZE + 1, set, set + 1, NULL, &tm.tv))
+ return 77;
+ printf("%s(%d, [%d], [], NULL, {0, 123}) = 0 (Timeout)\n",
+ TEST_SYSCALL_STR, FD_SETSIZE + 1, fds[0]);
+
+ puts("+++ exited with 0 +++");
+ return 0;
+}
+
+#else
+
+int
+main(void)
+{
+ return 77;
+}
+
+#endif
projects / strace / commitdiff