Module Name: src
Committed By: njoly
Date: Thu Jan 6 15:19:10 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/fs/vfs: Makefile
Added Files:
src/tests/fs/vfs: t_unpriv.c
Log Message:
Start unprivileged filesystem tests. For now, only chown/chmod owner
checks.
To generate a diff of this commit:
cvs rdiff -u -r1.212 -r1.213 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.13 -r1.14 src/tests/fs/vfs/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/vfs/t_unpriv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.212 src/distrib/sets/lists/tests/mi:1.213
--- src/distrib/sets/lists/tests/mi:1.212 Thu Jan 6 13:13:44 2011
+++ src/distrib/sets/lists/tests/mi Thu Jan 6 15:19:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.212 2011/01/06 13:13:44 pooka Exp $
+# $NetBSD: mi,v 1.213 2011/01/06 15:19:09 njoly Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -269,6 +269,7 @@
./usr/libdata/debug/usr/tests/fs/vfs/t_renamerace.debug tests-fs-debug debug,atf
./usr/libdata/debug/usr/tests/fs/vfs/t_rmdirrace.debug tests-fs-debug debug,atf
./usr/libdata/debug/usr/tests/fs/vfs/t_ro.debug tests-fs-debug debug,atf
+./usr/libdata/debug/usr/tests/fs/vfs/t_unpriv.debug tests-fs-debug debug,atf
./usr/libdata/debug/usr/tests/fs/vfs/t_vfsops.debug tests-fs-debug debug,atf
./usr/libdata/debug/usr/tests/fs/vfs/t_vnops.debug tests-fs-debug debug,atf
./usr/libdata/debug/usr/tests/include tests-ipf-tests
@@ -1222,6 +1223,7 @@
./usr/tests/fs/vfs/t_renamerace tests-fs-tests atf
./usr/tests/fs/vfs/t_rmdirrace tests-fs-tests atf
./usr/tests/fs/vfs/t_ro tests-fs-tests atf
+./usr/tests/fs/vfs/t_unpriv tests-fs-tests atf
./usr/tests/fs/vfs/t_vfsops tests-fs-tests atf
./usr/tests/fs/vfs/t_vnops tests-fs-tests atf
./usr/tests/games tests-games-tests
Index: src/tests/fs/vfs/Makefile
diff -u src/tests/fs/vfs/Makefile:1.13 src/tests/fs/vfs/Makefile:1.14
--- src/tests/fs/vfs/Makefile:1.13 Fri Dec 31 18:20:32 2010
+++ src/tests/fs/vfs/Makefile Thu Jan 6 15:19:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2010/12/31 18:20:32 pooka Exp $
+# $NetBSD: Makefile,v 1.14 2011/01/06 15:19:10 njoly Exp $
#
.include <bsd.own.mk>
@@ -11,6 +11,7 @@
TESTS_C+= t_renamerace
TESTS_C+= t_ro
TESTS_C+= t_rmdirrace
+TESTS_C+= t_unpriv
TESTS_C+= t_vfsops
TESTS_C+= t_vnops
Added files:
Index: src/tests/fs/vfs/t_unpriv.c
diff -u /dev/null src/tests/fs/vfs/t_unpriv.c:1.1
--- /dev/null Thu Jan 6 15:19:10 2011
+++ src/tests/fs/vfs/t_unpriv.c Thu Jan 6 15:19:10 2011
@@ -0,0 +1,83 @@
+/* $NetBSD: t_unpriv.c,v 1.1 2011/01/06 15:19:10 njoly Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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 <atf-c.h>
+#include <unistd.h>
+
+#include <rump/rump_syscalls.h>
+#include <rump/rump.h>
+
+#include "../common/h_fsmacros.h"
+#include "../../h_macros.h"
+
+#define USE_OWNER \
+ if (FSTYPE_SYSVBFS(tc) || FSTYPE_MSDOS(tc) || FSTYPE_RUMPFS(tc)) \
+ atf_tc_skip("owner not supported by file system")
+
+static void
+owner(const atf_tc_t *tc, const char *mp)
+{
+
+ USE_OWNER;
+
+ FSTEST_ENTER();
+
+ rump_pub_lwproc_rfork(RUMP_RFCFDG);
+ if (rump_sys_setuid(1) == -1)
+ atf_tc_fail_errno("setuid");
+ if (rump_sys_chown(".", 1, -1) != -1 || errno != EPERM)
+ atf_tc_fail_errno("chown");
+ if (rump_sys_chmod(".", 0000) != -1 || errno != EPERM)
+ atf_tc_fail_errno("chmod");
+ rump_pub_lwproc_releaselwp();
+
+ if (rump_sys_chown(".", 1, -1) == -1)
+ atf_tc_fail_errno("chown");
+
+ rump_pub_lwproc_rfork(RUMP_RFCFDG);
+ if (rump_sys_setuid(1) == -1)
+ atf_tc_fail_errno("setuid");
+ if (rump_sys_chown(".", 1, -1) == -1)
+ atf_tc_fail_errno("chown");
+ if (rump_sys_chmod(".", 0000) == -1)
+ atf_tc_fail_errno("chmod");
+ rump_pub_lwproc_releaselwp();
+
+ FSTEST_EXIT();
+}
+
+
+ATF_TC_FSAPPLY(owner, "owner unprivileged checks");
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_FSAPPLY(owner);
+
+ return atf_no_error();
+}
