Author: jonathan
Date: Thu Aug 18 23:15:04 2011
New Revision: 224989
URL: http://svn.freebsd.org/changeset/base/224989
Log:
Test process descriptors.
Ensure that process descriptors work as expected. We should be able to:
- pdfork(), like regular fork(), but producing a process descriptor
- pdgetpid() to convert a PD into a PID
- pdkill() to send signals to a process identified by a PD
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
Added:
head/tools/regression/security/cap_test/cap_test_pdfork.c (contents, props
changed)
head/tools/regression/security/cap_test/cap_test_pdkill.c (contents, props
changed)
Modified:
head/tools/regression/security/cap_test/Makefile
head/tools/regression/security/cap_test/cap_test.c
head/tools/regression/security/cap_test/cap_test.h
Modified: head/tools/regression/security/cap_test/Makefile
==============================================================================
--- head/tools/regression/security/cap_test/Makefile Thu Aug 18 23:08:52
2011 (r224988)
+++ head/tools/regression/security/cap_test/Makefile Thu Aug 18 23:15:04
2011 (r224989)
@@ -5,6 +5,8 @@ SRCS= cap_test.c \
cap_test_capmode.c \
cap_test_capabilities.c \
cap_test_fcntl.c \
+ cap_test_pdfork.c \
+ cap_test_pdkill.c \
cap_test_relative.c \
cap_test_sysctl.c \
Modified: head/tools/regression/security/cap_test/cap_test.c
==============================================================================
--- head/tools/regression/security/cap_test/cap_test.c Thu Aug 18 23:08:52
2011 (r224988)
+++ head/tools/regression/security/cap_test/cap_test.c Thu Aug 18 23:15:04
2011 (r224989)
@@ -49,6 +49,8 @@ struct test all_tests[] = {
TEST_INIT(capmode),
TEST_INIT(capabilities),
TEST_INIT(fcntl),
+ TEST_INIT(pdfork),
+ TEST_INIT(pdkill),
TEST_INIT(relative),
TEST_INIT(sysctl),
};
Modified: head/tools/regression/security/cap_test/cap_test.h
==============================================================================
--- head/tools/regression/security/cap_test/cap_test.h Thu Aug 18 23:08:52
2011 (r224988)
+++ head/tools/regression/security/cap_test/cap_test.h Thu Aug 18 23:15:04
2011 (r224989)
@@ -149,6 +149,9 @@ int execute(int id, struct test*);
int test_capmode(void);
int test_capabilities(void);
int test_fcntl(void);
+int test_pdfork(void);
+int test_pdkill(void);
+int test_pdwait(void);
int test_relative(void);
int test_sysctl(void);
Added: head/tools/regression/security/cap_test/cap_test_pdfork.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/security/cap_test/cap_test_pdfork.c Thu Aug 18
23:15:04 2011 (r224989)
@@ -0,0 +1,113 @@
+/*-
+ * Copyright (c) 2009-2011 Robert N. M. Watson
+ * Copyright (c) 2011 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 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.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * Test routines to make sure a variety of system calls are or are not
+ * available in capability mode. The goal is not to see if they work, just
+ * whether or not they return the expected ECAPMODE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+
+#include <sys/capability.h>
+#include <sys/errno.h>
+#include <sys/procdesc.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <stdio.h>
+#include <time.h>
+
+#include "cap_test.h"
+
+int
+test_pdfork(void)
+{
+ struct stat stat;
+ int success = PASSED;
+ int pd, error;
+ pid_t pid;
+ time_t now;
+
+ //cap_enter();
+
+ pid = pdfork(&pd, 0);
+ if (pid < 0)
+ err(-1, "pdfork");
+
+ else if (pid == 0) {
+ /*
+ * Child process.
+ *
+ * pd should not be a valid process descriptor.
+ */
+ error = pdgetpid(pd, &pid);
+ if (error != -1)
+ FAILX("pdgetpid succeeded");
+ else if (errno != EBADF)
+ FAIL("pdgetpid failed, but errno != EBADF");
+
+ exit(success);
+ }
+
+ /* Parent process. Ensure that [acm]times have been set correctly. */
+ REQUIRE(fstat(pd, &stat));
+
+ now = time(NULL);
+ CHECK(now != (time_t)-1);
+
+ CHECK(now >= stat.st_birthtime);
+ CHECK((now - stat.st_birthtime) < 2);
+ CHECK(stat.st_birthtime == stat.st_atime);
+ CHECK(stat.st_atime == stat.st_ctime);
+ CHECK(stat.st_ctime == stat.st_mtime);
+
+ /* Wait for the child to finish. */
+ error = pdgetpid(pd, &pid);
+ CHECK(error == 0);
+ CHECK(pid > 0);
+
+ int status;
+ while (waitpid(pid, &status, 0) != pid) {}
+ if ((success == PASSED) && WIFEXITED(status))
+ success = WEXITSTATUS(status);
+ else
+ success = FAILED;
+
+ return (success);
+}
Added: head/tools/regression/security/cap_test/cap_test_pdkill.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/security/cap_test/cap_test_pdkill.c Thu Aug 18
23:15:04 2011 (r224989)
@@ -0,0 +1,101 @@
+/*-
+ * Copyright (c) 2009-2011 Robert N. M. Watson
+ * Copyright (c) 2011 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 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.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * Test routines to make sure a variety of system calls are or are not
+ * available in capability mode. The goal is not to see if they work, just
+ * whether or not they return the expected ECAPMODE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+
+#include <sys/capability.h>
+#include <sys/errno.h>
+#include <sys/procdesc.h>
+#include <sys/resource.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <stdio.h>
+
+#include "cap_test.h"
+
+void handle_signal(int);
+void handle_signal(int sig) {
+ exit(PASSED);
+}
+
+int
+test_pdkill(void)
+{
+ int success = PASSED;
+ int pd, error;
+ pid_t pid;
+
+ //cap_enter();
+
+ error = pdfork(&pd, 0);
+ if (error < 0)
+ err(-1, "pdfork");
+
+ else if (error == 0) {
+ signal(SIGINT, handle_signal);
+ sleep(3600);
+ exit(FAILED);
+ }
+
+ /* Parent process; find the child's PID (we'll need it later). */
+ error = pdgetpid(pd, &pid);
+ if (error != 0)
+ FAIL("pdgetpid");
+
+ /* Kill the child! */
+ usleep(100);
+ error = pdkill(pd, SIGINT);
+ if (error != 0)
+ FAIL("pdkill");
+
+ /* Make sure the child finished properly. */
+ int status;
+ while (waitpid(pid, &status, 0) != pid) {}
+ if ((success == PASSED) && WIFEXITED(status))
+ success = WEXITSTATUS(status);
+ else
+ success = FAILED;
+
+ return (success);
+}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
