]> granicus.if.org Git - strace/commitdiff
Check dumping of io syscalls when descriptor arguments are sensibly large
authorDmitry V. Levin <ldv@altlinux.org>
Wed, 30 Nov 2016 00:56:04 +0000 (00:56 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Wed, 30 Nov 2016 00:56:04 +0000 (00:56 +0000)
* tests/tests.h (pipe_maxfd): New prototype.
* tests/pipe_maxfd.c: New file.
* tests/print_maxfd.c: Likewise.
* tests/.gitignore: Add print_maxfd.
* tests/Makefile.am (check_PROGRAMS): Likewise.
(libtests_a_SOURCES): Add pipe_maxfd.c.
* tests/readv.c (main): Use pipe_maxfd() instead of pipe(),
fds[0] instead of 0, fds[1] instead of 1.
* tests/readv.test: Use print_maxfd to specify dump descriptor numbers.

tests/.gitignore
tests/Makefile.am
tests/pipe_maxfd.c [new file with mode: 0644]
tests/print_maxfd.c [new file with mode: 0644]
tests/readv.c
tests/readv.test
tests/tests.h

index 2970f649dda99cc6e2e912b3db86473a1fe12da4..ce714a47c244f7ee2957c66b1d7c980ee4bf7564 100644 (file)
@@ -216,6 +216,7 @@ pread64-pwrite64
 preadv
 preadv-pwritev
 preadv2-pwritev2
+print_maxfd
 prlimit64
 process_vm_readv
 process_vm_writev
index 366ae7fa0b9dd5578c15289a043571d16711b4e2..ab43e2a65ac659be17ad41908aea40e2e161be24 100644 (file)
@@ -51,6 +51,7 @@ libtests_a_SOURCES = \
        libmmsg.c \
        libsocketcall.c \
        overflowuid.c \
+       pipe_maxfd.c \
        print_quoted_string.c \
        printflags.c \
        printxval.c \
@@ -274,6 +275,7 @@ check_PROGRAMS = \
        preadv \
        preadv-pwritev \
        preadv2-pwritev2 \
+       print_maxfd \
        prlimit64 \
        process_vm_readv \
        process_vm_writev \
diff --git a/tests/pipe_maxfd.c b/tests/pipe_maxfd.c
new file mode 100644 (file)
index 0000000..a1343f9
--- /dev/null
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 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 "tests.h"
+#include <limits.h>
+#include <unistd.h>
+#include <sys/resource.h>
+
+static void
+move_fd(int *from, int *to)
+{
+       for (; *to > *from; --*to) {
+               if (dup2(*from, *to) != *to)
+                       continue;
+               close(*from);
+               *from = *to;
+               break;
+       }
+}
+
+void
+pipe_maxfd(int pipefd[2])
+{
+       struct rlimit rlim;
+       if (getrlimit(RLIMIT_NOFILE, &rlim))
+               perror_msg_and_fail("getrlimit");
+       if (rlim.rlim_cur < rlim.rlim_max) {
+               struct rlimit rlim_new;
+               rlim_new.rlim_cur = rlim_new.rlim_max = rlim.rlim_max;
+               if (!setrlimit(RLIMIT_NOFILE, &rlim_new))
+                       rlim.rlim_cur = rlim.rlim_max;
+       }
+
+       if (pipe(pipefd))
+               perror_msg_and_fail("pipe");
+
+       int max_fd = (rlim.rlim_cur > 0 && rlim.rlim_cur < INT_MAX)
+                    ? rlim.rlim_cur - 1 : INT_MAX;
+
+       move_fd(&pipefd[1], &max_fd);
+       --max_fd;
+       move_fd(&pipefd[0], &max_fd);
+}
diff --git a/tests/print_maxfd.c b/tests/print_maxfd.c
new file mode 100644 (file)
index 0000000..c3d4ea8
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+ * Print the maximum descriptor number available.
+ *
+ * Copyright (c) 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 "tests.h"
+#include <stdio.h>
+#include <sys/resource.h>
+
+int
+main(void)
+{
+       int fds[2];
+       pipe_maxfd(fds);
+       printf("%d\n", fds[1]);
+       return 0;
+}
index 1015acdb541cc79def6e376d8e1c5f415d71a7d2..0e5aab65c2c114ab1d8d02c5a82f6cca1c46b609 100644 (file)
@@ -40,10 +40,7 @@ main(void)
        tprintf("%s", "");
 
        int fds[2];
-       if (pipe(fds))
-               perror_msg_and_fail("pipe");
-       assert(0 == fds[0]);
-       assert(1 == fds[1]);
+       pipe_maxfd(fds);
 
        static const char w0_c[] = "012";
        const char *w0_d = hexdump_strdup(w0_c);
@@ -60,13 +57,13 @@ main(void)
        void *w2 = tail_memdup(w2_c, LENGTH_OF(w2_c));
        long rc;
 
-       rc = writev(1, efault, 42);
-       tprintf("writev(1, %p, 42) = %ld %s (%m)\n",
-               efault, rc, errno2name());
+       rc = writev(fds[1], efault, 42);
+       tprintf("writev(%d, %p, 42) = %ld %s (%m)\n",
+               fds[1], efault, rc, errno2name());
 
-       rc = readv(0, efault, 42);
-       tprintf("readv(0, %p, 42) = %ld %s (%m)\n",
-               efault, rc, errno2name());
+       rc = readv(fds[0], efault, 42);
+       tprintf("readv(%d, %p, 42) = %ld %s (%m)\n",
+               fds[0], efault, rc, errno2name());
 
        static const char r0_c[] = "01234567";
        const char *r0_d = hexdump_strdup(r0_c);
@@ -87,21 +84,21 @@ main(void)
        };
        const struct iovec *w_iov = tail_memdup(w_iov_, sizeof(w_iov_));
 
-       tprintf("writev(1, [], 0) = %ld\n",
-               (long) writev(1, w_iov, 0));
+       tprintf("writev(%d, [], 0) = %ld\n",
+               fds[1], (long) writev(fds[1], w_iov, 0));
 
-       rc = writev(1, w_iov + ARRAY_SIZE(w_iov_) - 1, 2);
-       tprintf("writev(1, [{iov_base=\"%s\", iov_len=%u}, %p], 2)"
+       rc = writev(fds[1], w_iov + ARRAY_SIZE(w_iov_) - 1, 2);
+       tprintf("writev(%d, [{iov_base=\"%s\", iov_len=%u}, %p], 2)"
                " = %ld %s (%m)\n",
-               w2_c, LENGTH_OF(w2_c), w_iov + ARRAY_SIZE(w_iov_),
+               fds[1], w2_c, LENGTH_OF(w2_c), w_iov + ARRAY_SIZE(w_iov_),
                rc, errno2name());
 
        const unsigned int w_len =
                LENGTH_OF(w0_c) + LENGTH_OF(w1_c) + LENGTH_OF(w2_c);
 
-       assert(writev(1, w_iov, ARRAY_SIZE(w_iov_)) == (int) w_len);
-       close(1);
-       tprintf("writev(1, [{iov_base=\"%s\", iov_len=%u}"
+       assert(writev(fds[1], w_iov, ARRAY_SIZE(w_iov_)) == (int) w_len);
+       close(fds[1]);
+       tprintf("writev(%d, [{iov_base=\"%s\", iov_len=%u}"
                ", {iov_base=\"%s\", iov_len=%u}"
                ", {iov_base=\"%s\", iov_len=%u}], %u) = %u\n"
                " * %u bytes in buffer 0\n"
@@ -110,7 +107,7 @@ main(void)
                " | 00000 %-49s  %-16s |\n"
                " * %u bytes in buffer 2\n"
                " | 00000 %-49s  %-16s |\n",
-               w0_c, LENGTH_OF(w0_c), w1_c, LENGTH_OF(w1_c),
+               fds[1], w0_c, LENGTH_OF(w0_c), w1_c, LENGTH_OF(w1_c),
                w2_c, LENGTH_OF(w2_c), ARRAY_SIZE(w_iov_), w_len,
                LENGTH_OF(w0_c), w0_d, w0_c,
                LENGTH_OF(w1_c), w1_d, w1_c, LENGTH_OF(w2_c), w2_d, w2_c);
@@ -125,10 +122,11 @@ main(void)
        };
        const struct iovec *r_iov = tail_memdup(r0_iov_, sizeof(r0_iov_));
 
-       assert(readv(0, r_iov, ARRAY_SIZE(r0_iov_)) == (int) r_len);
-       tprintf("readv(0, [{iov_base=\"%s\", iov_len=%u}], %u) = %u\n"
+       assert(readv(fds[0], r_iov, ARRAY_SIZE(r0_iov_)) == (int) r_len);
+       tprintf("readv(%d, [{iov_base=\"%s\", iov_len=%u}], %u) = %u\n"
                " * %u bytes in buffer 0\n"
                " | 00000 %-49s  %-16s |\n",
+               fds[0],
                r0_c, r_len, ARRAY_SIZE(r0_iov_), r_len, r_len, r0_d, r0_c);
 
        void *r1 = tail_alloc(r_len);
@@ -145,14 +143,14 @@ main(void)
        };
        r_iov = tail_memdup(r1_iov_, sizeof(r1_iov_));
 
-       assert(readv(0, r_iov, ARRAY_SIZE(r1_iov_)) == (int) w_len - (int) r_len);
-       tprintf("readv(0, [{iov_base=\"%s\", iov_len=%u}"
+       assert(readv(fds[0], r_iov, ARRAY_SIZE(r1_iov_)) == (int) w_len - (int) r_len);
+       tprintf("readv(%d, [{iov_base=\"%s\", iov_len=%u}"
                ", {iov_base=\"\", iov_len=%u}], %u) = %u\n"
                " * %u bytes in buffer 0\n"
                " | 00000 %-49s  %-16s |\n",
-               r1_c, r_len, w_len, ARRAY_SIZE(r1_iov_), w_len - r_len,
+               fds[0], r1_c, r_len, w_len, ARRAY_SIZE(r1_iov_), w_len - r_len,
                w_len - r_len, r1_d, r1_c);
-       close(0);
+       close(fds[0]);
 
        tprintf("+++ exited with 0 +++\n");
        return 0;
index cbcffde99c03ae4182db4482816ef8eb0ca0b3f7..888f1b5025cd50e0113dcdd9d127d43cf38ed59a 100755 (executable)
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-# Check decoding of readv and writev syscalls.
-
+# Check decoding and dumping of readv and writev syscalls.
 . "${srcdir=.}/init.sh"
-run_strace_match_diff -a16 -eread=0 -ewrite=1 -e trace=readv,writev
+
+maxfd="$(./print_maxfd)"
+run_strace_match_diff \
+       -a16 -eread="$(($maxfd - 1))" -ewrite="$maxfd" -e trace=readv,writev
index 4453702ed5c24d1a93d39ac3cc9cc51fe624b983..f2e0a82b12fa7262f0db04be48d59b441e680bba 100644 (file)
@@ -137,6 +137,9 @@ struct timespec;
 int recv_mmsg(int, struct mmsghdr *, unsigned int, unsigned int, struct timespec *);
 int send_mmsg(int, struct mmsghdr *, unsigned int, unsigned int);
 
+/* Create a pipe with maximized descriptor numbers. */
+void pipe_maxfd(int pipefd[2]);
+
 # define ARRAY_SIZE(arg) ((unsigned int) (sizeof(arg) / sizeof((arg)[0])))
 # define LENGTH_OF(arg) ((unsigned int) sizeof(arg) - 1)