svn commit: r267679 - in head: etc/mtree libexec/rtld-elf libexec/rtld-elf/tests libexec/rtld-elf/tests/libpythagoras libexec/rtld-elf/tests/target
Jonathan Anderson
jonathan at FreeBSD.org
Fri Jun 20 17:15:01 UTC 2014
Author: jonathan
Date: Fri Jun 20 17:14:59 2014
New Revision: 267679
URL: http://svnweb.freebsd.org/changeset/base/267679
Log:
Test RTLD's new LD_LIBRARY_PATH_FDS variable.
Test LD_LIBRARY_PATH_FDS by linking a binary that requires a shared
library that isn't in any of the usual search paths. Ensure this fails
when we don't supply LD_LIBRARY_PATH_FDS or we pass invalid information
in it. Ensure it works when we pass the correct directory in various
places in the variable.
Approved by: rwatson (mentor)
MFC after: 3 weeks
Sponsored by: DARPA/AFRL
Added:
head/libexec/rtld-elf/tests/
head/libexec/rtld-elf/tests/Makefile (contents, props changed)
head/libexec/rtld-elf/tests/ld_library_pathfds.c (contents, props changed)
head/libexec/rtld-elf/tests/libpythagoras/
head/libexec/rtld-elf/tests/libpythagoras/Makefile (contents, props changed)
head/libexec/rtld-elf/tests/libpythagoras/pythagoras.c (contents, props changed)
head/libexec/rtld-elf/tests/libpythagoras/pythagoras.h (contents, props changed)
head/libexec/rtld-elf/tests/target/
head/libexec/rtld-elf/tests/target/Makefile (contents, props changed)
head/libexec/rtld-elf/tests/target/target.c (contents, props changed)
Modified:
head/etc/mtree/BSD.tests.dist
head/libexec/rtld-elf/Makefile
Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist Fri Jun 20 17:08:32 2014 (r267678)
+++ head/etc/mtree/BSD.tests.dist Fri Jun 20 17:14:59 2014 (r267679)
@@ -90,6 +90,7 @@
..
atf-sh
..
+ rtld-elf
..
..
sbin
Modified: head/libexec/rtld-elf/Makefile
==============================================================================
--- head/libexec/rtld-elf/Makefile Fri Jun 20 17:08:32 2014 (r267678)
+++ head/libexec/rtld-elf/Makefile Fri Jun 20 17:14:59 2014 (r267679)
@@ -80,5 +80,9 @@ beforeinstall:
NO_PIE= yes
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.symver.mk>
.include <bsd.prog.mk>
Added: head/libexec/rtld-elf/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/libexec/rtld-elf/tests/Makefile Fri Jun 20 17:14:59 2014 (r267679)
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/libexec/rtld-elf
+SUBDIR+= libpythagoras target
+
+.PATH: ${.CURDIR:H:H:H:H}/tests
+
+ATF_TESTS_C= ld_library_pathfds
+
+CFLAGS+= -DTESTSDIR="\"${TESTSDIR}\""
+
+.include <bsd.test.mk>
Added: head/libexec/rtld-elf/tests/ld_library_pathfds.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/libexec/rtld-elf/tests/ld_library_pathfds.c Fri Jun 20 17:14:59 2014 (r267679)
@@ -0,0 +1,220 @@
+/*-
+ * Copyright 2014 Jonathan Anderson.
+ * 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 ``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.
+ *
+ * $FreeBSD$
+ */
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <stdio.h>
+
+
+struct descriptors {
+ int binary;
+ int testdir;
+ int root;
+ int etc;
+ int usr;
+};
+
+static void setup(struct descriptors *);
+static void expect_success(int binary, char *pathfds);
+static void expect_missing_library(int binary, char *pathfds);
+
+static void try_to_run(int binary, int expected_exit_status,
+ char * const *env, const char *expected_out, const char *expected_err);
+static int opendir(const char *name);
+static int opendirat(int parent, const char *name);
+
+
+ATF_TC_WITHOUT_HEAD(missing_library);
+ATF_TC_BODY(missing_library, tc)
+{
+ struct descriptors files;
+
+ setup(&files);
+ expect_missing_library(files.binary, NULL);
+}
+
+
+ATF_TC_WITHOUT_HEAD(wrong_library_directories);
+ATF_TC_BODY(wrong_library_directories, tc)
+{
+ struct descriptors files;
+ char *pathfds;
+
+ setup(&files);
+ ATF_REQUIRE(
+ asprintf(&pathfds, "LD_LIBRARY_PATH_FDS=%d", files.etc) > 0);
+
+ expect_missing_library(files.binary, pathfds);
+}
+
+
+ATF_TC_WITHOUT_HEAD(bad_library_directories);
+ATF_TC_BODY(bad_library_directories, tc)
+{
+ struct descriptors files;
+ char *pathfds;
+
+ setup(&files);
+ ATF_REQUIRE(asprintf(&pathfds, "::", files.etc) > 0);
+
+ expect_missing_library(files.binary, pathfds);
+}
+
+
+ATF_TC_WITHOUT_HEAD(single_library_directory);
+ATF_TC_BODY(single_library_directory, tc)
+{
+ struct descriptors files;
+ char *pathfds;
+
+ setup(&files);
+ ATF_REQUIRE(
+ asprintf(&pathfds, "LD_LIBRARY_PATH_FDS=%d", files.testdir) > 0);
+
+ expect_success(files.binary, pathfds);
+}
+
+
+ATF_TC_WITHOUT_HEAD(first_library_directory);
+ATF_TC_BODY(first_library_directory, tc)
+{
+ struct descriptors files;
+ char *pathfds;
+
+ setup(&files);
+ ATF_REQUIRE(
+ asprintf(&pathfds, "LD_LIBRARY_PATH_FDS=%d:%d",
+ files.testdir, files.etc) > 0);
+
+ expect_success(files.binary, pathfds);
+}
+
+
+ATF_TC_WITHOUT_HEAD(middle_library_directory);
+ATF_TC_BODY(middle_library_directory, tc)
+{
+ struct descriptors files;
+ char *pathfds;
+
+ setup(&files);
+ ATF_REQUIRE(
+ asprintf(&pathfds, "LD_LIBRARY_PATH_FDS=%d:%d:%d",
+ files.root, files.testdir, files.usr) > 0);
+
+ expect_success(files.binary, pathfds);
+}
+
+
+ATF_TC_WITHOUT_HEAD(last_library_directory);
+ATF_TC_BODY(last_library_directory, tc)
+{
+ struct descriptors files;
+ char *pathfds;
+
+ setup(&files);
+ ATF_REQUIRE(
+ asprintf(&pathfds, "LD_LIBRARY_PATH_FDS=%d:%d",
+ files.root, files.testdir) > 0);
+
+ expect_success(files.binary, pathfds);
+}
+
+
+
+/* Register test cases with ATF. */
+ATF_TP_ADD_TCS(tp)
+{
+ ATF_TP_ADD_TC(tp, missing_library);
+ ATF_TP_ADD_TC(tp, wrong_library_directories);
+ ATF_TP_ADD_TC(tp, bad_library_directories);
+ ATF_TP_ADD_TC(tp, single_library_directory);
+ ATF_TP_ADD_TC(tp, first_library_directory);
+ ATF_TP_ADD_TC(tp, middle_library_directory);
+ ATF_TP_ADD_TC(tp, last_library_directory);
+
+ return atf_no_error();
+}
+
+
+static void
+setup(struct descriptors *dp)
+{
+
+ ATF_REQUIRE((dp->testdir = opendir(TESTSDIR)) >= 0);
+ ATF_REQUIRE(
+ (dp->binary = openat(dp->testdir, "target", O_RDONLY)) >= 0);
+
+ ATF_REQUIRE((dp->root = opendir("/")) >= 0);
+ ATF_REQUIRE((dp->etc = opendirat(dp->root, "etc")) >= 0);
+ ATF_REQUIRE((dp->usr = opendirat(dp->root, "usr")) >= 0);
+}
+
+static void
+expect_success(int binary, char *pathfds)
+{
+ char * const env[] = { pathfds, NULL };
+ try_to_run(binary, 0, env, "the hypotenuse of 3 and 4 is 5\n", "");
+}
+
+static void
+expect_missing_library(int binary, char *pathfds)
+{
+ char * const env[] = { pathfds, NULL };
+ try_to_run(binary, 1, env, "",
+ "Shared object \"libpythagoras.so.0\" not found,"
+ " required by \"target\"\n");
+}
+
+
+static void
+try_to_run(int binary, int exit_status, char * const *env,
+ const char *expected_out, const char *expected_err)
+{
+ pid_t child = atf_utils_fork();
+
+ if (child == 0) {
+ char * const args[] = { "target", NULL };
+
+ fexecve(binary, args, env);
+ atf_tc_fail("fexecve() failed");
+ }
+
+ atf_utils_wait(child, exit_status, expected_out, expected_err);
+}
+
+
+static int
+opendir(const char *name)
+{
+ return open(name, O_RDONLY | O_DIRECTORY);
+}
+
+static int
+opendirat(int parent, const char *name)
+{
+ return openat(parent, name, O_RDONLY | O_DIRECTORY);
+}
Added: head/libexec/rtld-elf/tests/libpythagoras/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/libexec/rtld-elf/tests/libpythagoras/Makefile Fri Jun 20 17:14:59 2014 (r267679)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB= pythagoras
+SHLIB_MAJOR= 0
+
+LIBDIR= ${TESTSBASE}${TESTSDIR}/libexec/rtld-elf
+SHLIBDIR= ${TESTSBASE}${TESTSDIR}/libexec/rtld-elf
+
+SRCS= pythagoras.c
+
+.include <bsd.lib.mk>
Added: head/libexec/rtld-elf/tests/libpythagoras/pythagoras.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/libexec/rtld-elf/tests/libpythagoras/pythagoras.c Fri Jun 20 17:14:59 2014 (r267679)
@@ -0,0 +1,42 @@
+/*-
+ * Copyright 2014 Jonathan Anderson.
+ * 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 ``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.
+ *
+ * $FreeBSD$
+ */
+
+#include <errno.h>
+#include <math.h>
+
+#include "pythagoras.h"
+
+double
+pythagorean_theorem(double a, double b)
+{
+
+ if (a <= 0 || b <= 0) {
+ errno = ERANGE;
+ return (-1.0);
+ }
+ return (sqrt(pow(a, 2) + pow(b, 2)));
+}
Added: head/libexec/rtld-elf/tests/libpythagoras/pythagoras.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/libexec/rtld-elf/tests/libpythagoras/pythagoras.h Fri Jun 20 17:14:59 2014 (r267679)
@@ -0,0 +1,28 @@
+/*-
+ * Copyright 2014 Jonathan Anderson.
+ * 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 ``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.
+ *
+ * $FreeBSD$
+ */
+
+double pythagorean_theorem(double, double);
Added: head/libexec/rtld-elf/tests/target/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/libexec/rtld-elf/tests/target/Makefile Fri Jun 20 17:14:59 2014 (r267679)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+PROG= target
+BINDIR= ${TESTSBASE}${TESTSDIR}/libexec/rtld-elf
+
+CFLAGS+= -I${.CURDIR}/../libpythagoras
+LDADD= -L${.OBJDIR}/../libpythagoras -lpythagoras
+
+MAN=
+
+.include <bsd.prog.mk>
Added: head/libexec/rtld-elf/tests/target/target.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/libexec/rtld-elf/tests/target/target.c Fri Jun 20 17:14:59 2014 (r267679)
@@ -0,0 +1,39 @@
+/*-
+ * Copyright 2014 Jonathan Anderson.
+ * 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 ``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.
+ *
+ * $FreeBSD$
+ */
+
+#include "pythagoras.h"
+
+#include <stdio.h>
+
+int
+main(int argc, char *argv[])
+{
+ float hypotenuse = pythagorean_theorem(3, 4);
+ printf("the hypotenuse of 3 and 4 is %d\n", (int) hypotenuse);
+
+ return 0;
+}
More information about the svn-src-all
mailing list