MFC r264737:

Discussed with: jilles

r264737 (by jilles):

libc/stdio: Fail fdopen() on an execute-only fd.

An execute-only fd (opened with O_EXEC) allows neither read() nor write()
and is therefore incompatible with all stdio modes. Therefore, the [EINVAL]
error applies.

Also adjust the similar check in freopen() with a NULL path, even though
this checks an fd which is already from a FILE.

5 files changed, 237 insertions, 1 deletions

diff --git a/tools/regression/lib/libc/stdio/Makefile b/tools/regression/lib/libc/stdio/Makefile
index 4fb2cba..688ea2a 100644
--- a/tools/regression/lib/libc/stdio/Makefile
+++ b/tools/regression/lib/libc/stdio/Makefile
@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-TESTS=	test-fopen \
+TESTS=	test-fdopen \
+	test-fopen \
+	test-freopen \
 	test-getdelim \
 	test-mkostemp \
 	test-open_memstream \
diff --git a/tools/regression/lib/libc/stdio/test-fdopen.c b/tools/regression/lib/libc/stdio/test-fdopen.c
new file mode 100644
index 0000000..33b33c5
--- /dev/null
+++ b/tools/regression/lib/libc/stdio/test-fdopen.c
@@ -0,0 +1,105 @@
+/*-
+ * Copyright (c) 2014 Jilles Tjoelker
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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 <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include	<fcntl.h>
+#include	<stdbool.h>
+#include	<stdio.h>
+#include	<string.h>
+#include	<unistd.h>
+
+static int testnum = 1;
+
+static void
+runtest(const char *fname, int intmode, const char *strmode, bool success)
+{
+	FILE *fp;
+	int fd;
+
+	fd = open(fname, intmode);
+	if (fd == -1) {
+		printf("not ok %d - open(\"%s\", %#x) failed\n",
+		    testnum++, fname, intmode);
+		return;
+	}
+	fp = fdopen(fd, strmode);
+	if (fp == NULL) {
+		close(fd);
+		if (success)
+			printf("not ok %d - "
+			    "fdopen(open(\"%s\", %#x), \"%s\") failed\n",
+			    testnum++, fname, intmode, strmode);
+		else
+			printf("ok %d - "
+			    "fdopen(open(\"%s\", %#x), \"%s\") failed\n",
+			    testnum++, fname, intmode, strmode);
+		return;
+	}
+	if (success)
+		printf("ok %d - "
+		    "fdopen(open(\"%s\", %#x), \"%s\") succeeded\n",
+		    testnum++, fname, intmode, strmode);
+	else
+		printf("not ok %d - "
+		    "fdopen(open(\"%s\", %#x), \"%s\") succeeded\n",
+		    testnum++, fname, intmode, strmode);
+	fclose(fp);
+}
+
+/*
+ * Test program for fdopen().
+ */
+int
+main(int argc, char *argv[])
+{
+	printf("1..19\n");
+	runtest("/dev/null", O_RDONLY, "r", true);
+	runtest("/dev/null", O_WRONLY, "r", false);
+	runtest("/dev/null", O_RDWR, "r", true);
+	runtest("/dev/null", O_RDONLY, "w", false);
+	runtest("/dev/null", O_WRONLY, "w", true);
+	runtest("/dev/null", O_RDWR, "w", true);
+	runtest("/dev/null", O_RDONLY, "a", false);
+	runtest("/dev/null", O_WRONLY, "a", true);
+	runtest("/dev/null", O_RDWR, "a", true);
+	runtest("/dev/null", O_RDONLY, "r+", false);
+	runtest("/dev/null", O_WRONLY, "r+", false);
+	runtest("/dev/null", O_RDWR, "r+", true);
+	runtest("/dev/null", O_RDONLY, "w+", false);
+	runtest("/dev/null", O_WRONLY, "w+", false);
+	runtest("/dev/null", O_RDWR, "w+", true);
+	runtest("/bin/sh", O_EXEC, "r", false);
+	runtest("/bin/sh", O_EXEC, "w", false);
+	runtest("/bin/sh", O_EXEC, "r+", false);
+	runtest("/bin/sh", O_EXEC, "w+", false);
+
+	return 0;
+}
+
+/* vim:ts=8:cin:sw=8
+ *  */
diff --git a/tools/regression/lib/libc/stdio/test-fdopen.t b/tools/regression/lib/libc/stdio/test-fdopen.t
new file mode 100644
index 0000000..8bdfd03
--- /dev/null
+++ b/tools/regression/lib/libc/stdio/test-fdopen.t
@@ -0,0 +1,10 @@
+#!/bin/sh
+# $FreeBSD$
+
+cd `dirname $0`
+
+executable=`basename $0 .t`
+
+make $executable 2>&1 > /dev/null
+
+exec ./$executable
diff --git a/tools/regression/lib/libc/stdio/test-freopen.c b/tools/regression/lib/libc/stdio/test-freopen.c
new file mode 100644
index 0000000..37f3598
--- /dev/null
+++ b/tools/regression/lib/libc/stdio/test-freopen.c
@@ -0,0 +1,109 @@
+/*-
+ * Copyright (c) 2014 Jilles Tjoelker
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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 <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include	<stdbool.h>
+#include	<stdio.h>
+#include	<string.h>
+
+static int testnum = 1;
+
+static void
+runtest(const char *fname1, const char *mode1, const char *fname2,
+    const char *mode2, bool success)
+{
+	FILE *fp1, *fp2;
+	const char *fname2_print;
+
+	fname2_print = fname2 != NULL ? fname2 : "<NULL>";
+	fp1 = fopen(fname1, mode1);
+	if (fp1 == NULL) {
+		printf("not ok %d - fopen(\"%s\", \"%s\") failed\n",
+		    testnum++, fname1, mode1);
+		return;
+	}
+	fp2 = freopen(fname2, mode2, fp1);
+	if (fp2 == NULL) {
+		fclose(fp1);
+		if (success)
+			printf("not ok %d - "
+			    "freopen(\"%s\", \"%s\", fopen(\"%s\", \"%s\")) "
+			    "failed\n",
+			    testnum++, fname2_print, mode2, fname1, mode1);
+		else
+			printf("ok %d - "
+			    "freopen(\"%s\", \"%s\", fopen(\"%s\", \"%s\")) "
+			    "failed\n",
+			    testnum++, fname2_print, mode2, fname1, mode1);
+		return;
+	}
+	if (success)
+		printf("ok %d - "
+		    "freopen(\"%s\", \"%s\", fopen(\"%s\", \"%s\")) "
+		    "succeeded\n",
+		    testnum++, fname2_print, mode2, fname1, mode1);
+	else
+		printf("not ok %d - "
+		    "freopen(\"%s\", \"%s\", fopen(\"%s\", \"%s\")) "
+		    "succeeded\n",
+		    testnum++, fname2_print, mode2, fname1, mode1);
+	fclose(fp2);
+}
+
+/*
+ * Test program for freopen().
+ */
+int
+main(int argc, char *argv[])
+{
+	printf("1..19\n");
+	runtest("/dev/null", "r", NULL, "r", true);
+	runtest("/dev/null", "w", NULL, "r", false);
+	runtest("/dev/null", "r+", NULL, "r", true);
+	runtest("/dev/null", "r", NULL, "w", false);
+	runtest("/dev/null", "w", NULL, "w", true);
+	runtest("/dev/null", "r+", NULL, "w", true);
+	runtest("/dev/null", "r", NULL, "a", false);
+	runtest("/dev/null", "w", NULL, "a", true);
+	runtest("/dev/null", "r+", NULL, "a", true);
+	runtest("/dev/null", "r", NULL, "r+", false);
+	runtest("/dev/null", "w", NULL, "r+", false);
+	runtest("/dev/null", "r+", NULL, "r+", true);
+	runtest("/dev/null", "r", NULL, "w+", false);
+	runtest("/dev/null", "w", NULL, "w+", false);
+	runtest("/dev/null", "r+", NULL, "w+", true);
+	runtest("/bin/sh", "r", NULL, "r", true);
+	runtest("/bin/sh", "r", "/bin/sh", "r", true);
+	runtest("/bin/sh", "r", "/dev/null", "r", true);
+	runtest("/bin/sh", "r", "/dev/null", "w", true);
+
+	return 0;
+}
+
+/* vim:ts=8:cin:sw=8
+ *  */
diff --git a/tools/regression/lib/libc/stdio/test-freopen.t b/tools/regression/lib/libc/stdio/test-freopen.t
new file mode 100644
index 0000000..8bdfd03
--- /dev/null
+++ b/tools/regression/lib/libc/stdio/test-freopen.t
@@ -0,0 +1,10 @@
+#!/bin/sh
+# $FreeBSD$
+
+cd `dirname $0`
+
+executable=`basename $0 .t`
+
+make $executable 2>&1 > /dev/null
+
+exec ./$executable