* [LTP] [PATCH] Add ltp pivot_root test
@ 2019-02-28 19:36 Paul Lawrence
2019-03-01 9:24 ` Matthias =?unknown-8bit?q?M=C3=A4nnich?=
0 siblings, 1 reply; 4+ messages in thread
From: Paul Lawrence @ 2019-02-28 19:36 UTC (permalink / raw)
To: ltp
pivot_root03.c is missing - it tests the claim that pivot_root fails
with EBUSY if a filesystem is mounted on put_old, but this is no longer
true.
Signed-off-by: Paul Lawrence <paullawrence@google.com>
---
testcases/kernel/syscalls/pivot_root/Makefile | 23 +++++
.../kernel/syscalls/pivot_root/pivot_root01.c | 66 +++++++++++++
.../kernel/syscalls/pivot_root/pivot_root02.c | 78 +++++++++++++++
.../kernel/syscalls/pivot_root/pivot_root04.c | 82 ++++++++++++++++
.../kernel/syscalls/pivot_root/pivot_root05.c | 76 +++++++++++++++
.../kernel/syscalls/pivot_root/pivot_root06.c | 94 +++++++++++++++++++
6 files changed, 419 insertions(+)
create mode 100644 testcases/kernel/syscalls/pivot_root/Makefile
create mode 100644 testcases/kernel/syscalls/pivot_root/pivot_root01.c
create mode 100644 testcases/kernel/syscalls/pivot_root/pivot_root02.c
create mode 100644 testcases/kernel/syscalls/pivot_root/pivot_root04.c
create mode 100644 testcases/kernel/syscalls/pivot_root/pivot_root05.c
create mode 100644 testcases/kernel/syscalls/pivot_root/pivot_root06.c
diff --git a/testcases/kernel/syscalls/pivot_root/Makefile b/testcases/kernel/syscalls/pivot_root/Makefile
new file mode 100644
index 000000000..a6f0e1499
--- /dev/null
+++ b/testcases/kernel/syscalls/pivot_root/Makefile
@@ -0,0 +1,23 @@
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+# the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
+top_srcdir ?= ../../../..
+
+include $(top_srcdir)/include/mk/testcases.mk
+
+CFLAGS += -lcap
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/pivot_root/pivot_root01.c b/testcases/kernel/syscalls/pivot_root/pivot_root01.c
new file mode 100644
index 000000000..f0b884774
--- /dev/null
+++ b/testcases/kernel/syscalls/pivot_root/pivot_root01.c
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+//
+// Copyright (c) 2019 Google, Inc.
+
+#define _GNU_SOURCE
+
+#include <linux/unistd.h>
+#include <sched.h>
+#include <sys/mount.h>
+#include <stdlib.h>
+
+#include "tst_test.h"
+
+#ifdef HAVE_UNSHARE
+
+static void run(void)
+{
+ const char* chroot_dir = "chroot";
+ const char* new_root = "/new_root";
+ const char* put_old = "/new_root/put_old";
+
+ int pid;
+
+ if ((pid = SAFE_FORK()) == -1) {
+ tst_brk(TBROK, "Could not fork");
+ }
+
+ if (pid == 0) {
+ if (unshare(CLONE_NEWNS | CLONE_FS)) {
+ tst_res(TFAIL | TERRNO, "unshare failed");
+ exit (1);
+ }
+
+ SAFE_MOUNT("none", "/", NULL, MS_REC|MS_PRIVATE, NULL);
+ SAFE_MKDIR(chroot_dir, 0777);
+ SAFE_MOUNT("none", chroot_dir, "tmpfs", 0, 0);
+ SAFE_CHROOT(chroot_dir);
+ SAFE_MKDIR(new_root, 0777);
+ SAFE_MOUNT("none", new_root, "tmpfs", 0, 0);
+ SAFE_MKDIR(put_old, 0777);
+
+ if (syscall(__NR_pivot_root, new_root, put_old) == -1) {
+ tst_res(TFAIL | TERRNO, "pivot_root failed");
+ exit (1);
+ }
+
+ tst_res(TPASS, "pivot_root succeeded");
+ exit(0);
+ }
+
+ tst_reap_children();
+}
+
+#else
+static void run(void)
+{
+ tst_brk(TCONF, NULL, "unshare is undefined.");
+}
+#endif
+
+static struct tst_test test = {
+ .test_all = run,
+ .needs_tmpdir = 1,
+ .needs_root = 1,
+ .forks_child = 1,
+};
diff --git a/testcases/kernel/syscalls/pivot_root/pivot_root02.c b/testcases/kernel/syscalls/pivot_root/pivot_root02.c
new file mode 100644
index 000000000..41339c768
--- /dev/null
+++ b/testcases/kernel/syscalls/pivot_root/pivot_root02.c
@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+//
+// Copyright (c) 2019 Google, Inc.
+
+#define _GNU_SOURCE
+
+#include <errno.h>
+#include <linux/unistd.h>
+#include <sched.h>
+#include <sys/mount.h>
+#include <stdlib.h>
+
+#include "tst_test.h"
+
+#ifdef HAVE_UNSHARE
+
+static void run(void)
+{
+ const char* chroot_dir = "chroot";
+ const char* new_root = "/new_root";
+ const char* put_old = "/new_root/put_old";
+
+ int pid;
+
+ if ((pid = SAFE_FORK()) == -1)
+ tst_brk(TBROK, "Could not fork");
+
+ if (pid == 0) {
+ if (unshare(CLONE_NEWNS | CLONE_FS)) {
+ tst_res(TFAIL | TERRNO, "unshare failed");
+ exit (1);
+ }
+
+ SAFE_MOUNT("none", "/", NULL, MS_REC|MS_PRIVATE, NULL);
+ SAFE_MKDIR(chroot_dir, 0777);
+ SAFE_MOUNT("none", chroot_dir, "tmpfs", 0, 0);
+ SAFE_CHROOT(chroot_dir);
+ SAFE_MKDIR(new_root, 0777);
+
+ // EBUSY
+ // new_root or put_old are on the current root file system
+ //
+ // Comment out to trigger this error
+ // SAFE_MOUNT("none", new_root, "tmpfs", 0, 0);
+
+ SAFE_MKDIR(put_old, 0777);
+
+ if (syscall(__NR_pivot_root, new_root, put_old) == 0) {
+ tst_res(TFAIL, "pivot_root succeeded unexpectedly");
+ exit (1);
+ }
+
+ if (errno != EBUSY) {
+ tst_res(TFAIL | TERRNO,
+ "pivot_root failed with wrong errno");
+ exit (1);
+ }
+
+ tst_res(TPASS, "pivot_root failed with EBUSY as expected");
+ exit(0);
+ }
+
+ tst_reap_children();
+}
+
+#else
+static void run(void)
+{
+ tst_brk(TCONF, NULL, "unshare is undefined.");
+}
+#endif
+
+static struct tst_test test = {
+ .test_all = run,
+ .needs_tmpdir = 1,
+ .needs_root = 1,
+ .forks_child = 1,
+};
diff --git a/testcases/kernel/syscalls/pivot_root/pivot_root04.c b/testcases/kernel/syscalls/pivot_root/pivot_root04.c
new file mode 100644
index 000000000..d2959130d
--- /dev/null
+++ b/testcases/kernel/syscalls/pivot_root/pivot_root04.c
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+//
+// Copyright (c) 2019 Google, Inc.
+
+#define _GNU_SOURCE
+
+#include <errno.h>
+#include <linux/unistd.h>
+#include <sched.h>
+#include <sys/mount.h>
+#include <stdlib.h>
+
+#include "tst_test.h"
+
+#ifdef HAVE_UNSHARE
+
+static void run(void)
+{
+ const char* chroot_dir = "chroot";
+ const char* new_root = "/new_root";
+
+ // EINVAL
+ // put_old is not underneath new_root
+ // Note: if put_old and new_root are on the same fs,
+ // pivot_root fails with EBUSY before testing reachability
+ const char* put_old_fs = "/put_old_fs";
+ const char* put_old = "/put_old_fs/put_old";
+
+ int pid;
+
+ if ((pid = SAFE_FORK()) == -1) {
+ tst_brk(TBROK, "Could not fork");
+ }
+
+ if (pid == 0) {
+ if (unshare(CLONE_NEWNS | CLONE_FS)) {
+ tst_res(TFAIL | TERRNO, "unshare failed");
+ exit (1);
+ }
+
+ SAFE_MOUNT("none", "/", NULL, MS_REC|MS_PRIVATE, NULL);
+ SAFE_MKDIR(chroot_dir, 0777);
+ SAFE_MOUNT("none", chroot_dir, "tmpfs", 0, 0);
+ SAFE_CHROOT(chroot_dir);
+ SAFE_MKDIR(new_root, 0777);
+ SAFE_MOUNT("none", new_root, "tmpfs", 0, 0);
+
+ SAFE_MKDIR(put_old_fs, 0777);
+ SAFE_MOUNT("none", put_old_fs, "tmpfs", 0, 0);
+ SAFE_MKDIR(put_old, 0777);
+
+ if (syscall(__NR_pivot_root, new_root, put_old) == 0) {
+ tst_res(TFAIL, "pivot_root succeeded unexpectedly");
+ exit (1);
+ }
+
+ if (errno != EINVAL) {
+ tst_res(TFAIL | TERRNO,
+ "pivot_root failed with wrong errno");
+ exit (1);
+ }
+
+ tst_res(TPASS, "pivot_root failed with EINVAL as expected");
+ exit(0);
+ }
+
+ tst_reap_children();
+}
+
+#else
+static void run(void)
+{
+ tst_brk(TCONF, NULL, "unshare is undefined.");
+}
+#endif
+
+static struct tst_test test = {
+ .test_all = run,
+ .needs_tmpdir = 1,
+ .needs_root = 1,
+ .forks_child = 1,
+};
diff --git a/testcases/kernel/syscalls/pivot_root/pivot_root05.c b/testcases/kernel/syscalls/pivot_root/pivot_root05.c
new file mode 100644
index 000000000..7f58fccfc
--- /dev/null
+++ b/testcases/kernel/syscalls/pivot_root/pivot_root05.c
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+//
+// Copyright (c) 2019 Google, Inc.
+
+#define _GNU_SOURCE
+
+#include <errno.h>
+#include <linux/unistd.h>
+#include <sched.h>
+#include <sys/mount.h>
+#include <stdlib.h>
+
+#include "tst_test.h"
+
+#ifdef HAVE_UNSHARE
+
+static void run(void)
+{
+ const char* chroot_dir = "chroot";
+ const char* new_root = "/new_root";
+ const char* put_old = "/new_root/put_old";
+
+ int pid;
+
+ if ((pid = SAFE_FORK()) == -1) {
+ tst_brk(TBROK, "Could not fork");
+ }
+
+ if (pid == 0) {
+ if (unshare(CLONE_NEWNS | CLONE_FS)) {
+ tst_res(TFAIL | TERRNO, "unshare failed");
+ exit (1);
+ }
+
+ SAFE_MOUNT("none", "/", NULL, MS_REC|MS_PRIVATE, NULL);
+ SAFE_MKDIR(chroot_dir, 0777);
+ SAFE_MOUNT("none", chroot_dir, "tmpfs", 0, 0);
+ SAFE_CHROOT(chroot_dir);
+ SAFE_MKDIR(new_root, 0777);
+ SAFE_MOUNT("none", new_root, "tmpfs", 0, 0);
+
+ // ENOTDIR
+ // new_root or put_old is not a directory
+ SAFE_CREAT(put_old, 0777);
+
+ if (syscall(__NR_pivot_root, new_root, put_old) == 0) {
+ tst_res(TFAIL, "pivot_root succeeded unexpectedly");
+ exit (1);
+ }
+
+ if (errno != ENOTDIR) {
+ tst_res(TFAIL | TERRNO,
+ "pivot_root failed with wrong errno");
+ exit (1);
+ }
+
+ tst_res(TPASS, "pivot_root failed with EBUSY as expected");
+ exit(0);
+ }
+
+ tst_reap_children();
+}
+
+#else
+static void run(void)
+{
+ tst_brk(TCONF, NULL, "unshare is undefined.");
+}
+#endif
+
+static struct tst_test test = {
+ .test_all = run,
+ .needs_tmpdir = 1,
+ .needs_root = 1,
+ .forks_child = 1,
+};
diff --git a/testcases/kernel/syscalls/pivot_root/pivot_root06.c b/testcases/kernel/syscalls/pivot_root/pivot_root06.c
new file mode 100644
index 000000000..ac3b08321
--- /dev/null
+++ b/testcases/kernel/syscalls/pivot_root/pivot_root06.c
@@ -0,0 +1,94 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+//
+// Copyright (c) 2019 Google, Inc.
+
+#define _GNU_SOURCE
+
+#include <errno.h>
+#include <linux/unistd.h>
+#include <sched.h>
+#include <sys/capability.h>
+#include <sys/mount.h>
+#include <stdlib.h>
+
+#include "tst_test.h"
+
+#ifdef HAVE_UNSHARE
+
+static void run(void)
+{
+ const char* chroot_dir = "chroot";
+ const char* new_root = "/new_root";
+ const char* put_old = "/new_root/put_old";
+
+ int pid;
+
+ if ((pid = SAFE_FORK()) == -1) {
+ tst_brk(TBROK, "Could not fork");
+ }
+
+
+ if (pid == 0) {
+ if (unshare(CLONE_NEWNS | CLONE_FS)) {
+ tst_res(TFAIL | TERRNO, "unshare failed");
+ exit (1);
+ }
+
+ SAFE_MOUNT("none", "/", NULL, MS_REC|MS_PRIVATE, NULL);
+ SAFE_MKDIR(chroot_dir, 0777);
+ SAFE_MOUNT("none", chroot_dir, "tmpfs", 0, 0);
+ SAFE_CHROOT(chroot_dir);
+ SAFE_MKDIR(new_root, 0777);
+ SAFE_MOUNT("none", new_root, "tmpfs", 0, 0);
+ SAFE_MKDIR(put_old, 0777);
+
+ // EPERM
+ // The calling process does not have the CAP_SYS_ADMIN capability.
+ cap_value_t cap_value[] = { CAP_SYS_ADMIN };
+ cap_t cap = cap_get_proc();
+ if (!cap) {
+ tst_res(TFAIL | TERRNO, "cap_get_proc failed");
+ exit (1);
+ }
+
+ if (cap_set_flag(cap, CAP_EFFECTIVE, 1, cap_value, CAP_CLEAR)) {
+ tst_res(TFAIL | TERRNO, "cap_set_flag failed");
+ exit (1);
+ }
+
+ if (cap_set_proc(cap)) {
+ tst_res(TFAIL | TERRNO, "cap_set_proc failed");
+ exit (1);
+ }
+
+ if (syscall(__NR_pivot_root, new_root, put_old) == 0) {
+ tst_res(TFAIL, "pivot_root succeeded unexpectedly");
+ exit (1);
+ }
+
+ if (errno != EPERM) {
+ tst_res(TFAIL | TERRNO,
+ "pivot_root failed with wrong errno");
+ exit (1);
+ }
+
+ tst_res(TPASS, "pivot_root failed with EPERM as expected");
+ exit(0);
+ }
+
+ tst_reap_children();
+}
+
+#else
+static void run(void)
+{
+ tst_brk(TCONF, NULL, "unshare is undefined.");
+}
+#endif
+
+static struct tst_test test = {
+ .test_all = run,
+ .needs_tmpdir = 1,
+ .needs_root = 1,
+ .forks_child = 1,
+};
--
2.21.0.352.gf09ad66450-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [LTP] [PATCH] Add ltp pivot_root test
2019-02-28 19:36 [LTP] [PATCH] Add ltp pivot_root test Paul Lawrence
@ 2019-03-01 9:24 ` Matthias =?unknown-8bit?q?M=C3=A4nnich?=
0 siblings, 0 replies; 4+ messages in thread
From: Matthias =?unknown-8bit?q?M=C3=A4nnich?= @ 2019-03-01 9:24 UTC (permalink / raw)
To: ltp
Hi Paul!
On Thu, Feb 28, 2019 at 11:36:45AM -0800, Paul Lawrence wrote:
> pivot_root03.c is missing - it tests the claim that pivot_root fails
> with EBUSY if a filesystem is mounted on put_old, but this is no longer
> true.
>
> Signed-off-by: Paul Lawrence <paullawrence@google.com>
> ---
> testcases/kernel/syscalls/pivot_root/Makefile | 23 +++++
> .../kernel/syscalls/pivot_root/pivot_root01.c | 66 +++++++++++++
> .../kernel/syscalls/pivot_root/pivot_root02.c | 78 +++++++++++++++
> .../kernel/syscalls/pivot_root/pivot_root04.c | 82 ++++++++++++++++
> .../kernel/syscalls/pivot_root/pivot_root05.c | 76 +++++++++++++++
> .../kernel/syscalls/pivot_root/pivot_root06.c | 94 +++++++++++++++++++
> 6 files changed, 419 insertions(+)
> create mode 100644 testcases/kernel/syscalls/pivot_root/Makefile
> create mode 100644 testcases/kernel/syscalls/pivot_root/pivot_root01.c
> create mode 100644 testcases/kernel/syscalls/pivot_root/pivot_root02.c
> create mode 100644 testcases/kernel/syscalls/pivot_root/pivot_root04.c
> create mode 100644 testcases/kernel/syscalls/pivot_root/pivot_root05.c
> create mode 100644 testcases/kernel/syscalls/pivot_root/pivot_root06.c
>
> diff --git a/testcases/kernel/syscalls/pivot_root/Makefile b/testcases/kernel/syscalls/pivot_root/Makefile
> new file mode 100644
> index 000000000..a6f0e1499
> --- /dev/null
> +++ b/testcases/kernel/syscalls/pivot_root/Makefile
> @@ -0,0 +1,23 @@
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 2 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
> +# the GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> +#
You should be able to replace this block with a SPDX license tag and a
copyright note (as you did in the source files).
> +
> +top_srcdir ?= ../../../..
> +
> +include $(top_srcdir)/include/mk/testcases.mk
> +
> +CFLAGS += -lcap
> +
> +include $(top_srcdir)/include/mk/generic_leaf_target.mk
> diff --git a/testcases/kernel/syscalls/pivot_root/pivot_root01.c b/testcases/kernel/syscalls/pivot_root/pivot_root01.c
> new file mode 100644
> index 000000000..f0b884774
> --- /dev/null
> +++ b/testcases/kernel/syscalls/pivot_root/pivot_root01.c
> @@ -0,0 +1,66 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +//
> +// Copyright (c) 2019 Google, Inc.
> +
> +#define _GNU_SOURCE
> +
> +#include <linux/unistd.h>
> +#include <sched.h>
> +#include <sys/mount.h>
> +#include <stdlib.h>
> +
> +#include "tst_test.h"
> +
> +#ifdef HAVE_UNSHARE
> +
> +static void run(void)
> +{
> + const char* chroot_dir = "chroot";
> + const char* new_root = "/new_root";
> + const char* put_old = "/new_root/put_old";
> +
> + int pid;
> +
> + if ((pid = SAFE_FORK()) == -1) {
SAFE_FORK is handling this case already. See lib/tst_test.c#safe_fork().
> + tst_brk(TBROK, "Could not fork");
> + }
> +
> + if (pid == 0) {
> + if (unshare(CLONE_NEWNS | CLONE_FS)) {
> + tst_res(TFAIL | TERRNO, "unshare failed");
> + exit (1);
Use tst_brk() to report the test error and exit.
> + }
> +
> + SAFE_MOUNT("none", "/", NULL, MS_REC|MS_PRIVATE, NULL);
> + SAFE_MKDIR(chroot_dir, 0777);
> + SAFE_MOUNT("none", chroot_dir, "tmpfs", 0, 0);
> + SAFE_CHROOT(chroot_dir);
> + SAFE_MKDIR(new_root, 0777);
> + SAFE_MOUNT("none", new_root, "tmpfs", 0, 0);
> + SAFE_MKDIR(put_old, 0777);
The test cases share a fair amount of code. Consider consolidating this
into a common `setup()` method.
In addition, it appears to me the testcases 1,2,4 and 5 are similar
enough to be able to combine them in one test with several cases.
> +
> + if (syscall(__NR_pivot_root, new_root, put_old) == -1) {
> + tst_res(TFAIL | TERRNO, "pivot_root failed");
> + exit (1);
> + }
TEST(tst_syscall(__NR_pivot_root, new_root, put_old));
if (TST_RET == -1)
tst_brk(TFAIL, TTERRNO, "pivot_root failed");
There are more locations where this pattern would apply. See e.g.
testcases/kernel/syscalls/vhangup/vhangup01.c for how to further handle
specific errors.
> +
> + tst_res(TPASS, "pivot_root succeeded");
> + exit(0);
Reporting the error code should be done by the test framework. You could
make the cleanup code conditional if you need to exit early here.
> + }
> +
> + tst_reap_children();
Consider putting this into a `cleanup()` method (or an else block).
> +}
> +
> +#else
> +static void run(void)
> +{
> + tst_brk(TCONF, NULL, "unshare is undefined.");
> +}
> +#endif
> +
> +static struct tst_test test = {
> + .test_all = run,
> + .needs_tmpdir = 1,
> + .needs_root = 1,
> + .forks_child = 1,
> +};
> diff --git a/testcases/kernel/syscalls/pivot_root/pivot_root02.c b/testcases/kernel/syscalls/pivot_root/pivot_root02.c
> new file mode 100644
> index 000000000..41339c768
> --- /dev/null
> +++ b/testcases/kernel/syscalls/pivot_root/pivot_root02.c
> @@ -0,0 +1,78 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +//
> +// Copyright (c) 2019 Google, Inc.
> +
> +#define _GNU_SOURCE
> +
> +#include <errno.h>
> +#include <linux/unistd.h>
> +#include <sched.h>
> +#include <sys/mount.h>
> +#include <stdlib.h>
> +
> +#include "tst_test.h"
> +
> +#ifdef HAVE_UNSHARE
> +
> +static void run(void)
> +{
> + const char* chroot_dir = "chroot";
> + const char* new_root = "/new_root";
> + const char* put_old = "/new_root/put_old";
> +
> + int pid;
> +
> + if ((pid = SAFE_FORK()) == -1)
> + tst_brk(TBROK, "Could not fork");
> +
> + if (pid == 0) {
> + if (unshare(CLONE_NEWNS | CLONE_FS)) {
> + tst_res(TFAIL | TERRNO, "unshare failed");
> + exit (1);
Use tst_brk(). There are more cases across this patch where this
applies.
> + }
> +
> + SAFE_MOUNT("none", "/", NULL, MS_REC|MS_PRIVATE, NULL);
> + SAFE_MKDIR(chroot_dir, 0777);
> + SAFE_MOUNT("none", chroot_dir, "tmpfs", 0, 0);
> + SAFE_CHROOT(chroot_dir);
> + SAFE_MKDIR(new_root, 0777);
> +
> + // EBUSY
> + // new_root or put_old are on the current root file system
> + //
> + // Comment out to trigger this error
> + // SAFE_MOUNT("none", new_root, "tmpfs", 0, 0);
> +
> + SAFE_MKDIR(put_old, 0777);
> +
> + if (syscall(__NR_pivot_root, new_root, put_old) == 0) {
> + tst_res(TFAIL, "pivot_root succeeded unexpectedly");
> + exit (1);
> + }
> +
> + if (errno != EBUSY) {
> + tst_res(TFAIL | TERRNO,
> + "pivot_root failed with wrong errno");
> + exit (1);
> + }
> +
> + tst_res(TPASS, "pivot_root failed with EBUSY as expected");
> + exit(0);
> + }
> +
> + tst_reap_children();
> +}
> +
> +#else
> +static void run(void)
> +{
> + tst_brk(TCONF, NULL, "unshare is undefined.");
> +}
> +#endif
> +
> +static struct tst_test test = {
> + .test_all = run,
> + .needs_tmpdir = 1,
> + .needs_root = 1,
> + .forks_child = 1,
> +};
> diff --git a/testcases/kernel/syscalls/pivot_root/pivot_root04.c b/testcases/kernel/syscalls/pivot_root/pivot_root04.c
> new file mode 100644
> index 000000000..d2959130d
> --- /dev/null
> +++ b/testcases/kernel/syscalls/pivot_root/pivot_root04.c
> @@ -0,0 +1,82 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +//
> +// Copyright (c) 2019 Google, Inc.
> +
> +#define _GNU_SOURCE
> +
> +#include <errno.h>
> +#include <linux/unistd.h>
> +#include <sched.h>
> +#include <sys/mount.h>
> +#include <stdlib.h>
> +
> +#include "tst_test.h"
> +
> +#ifdef HAVE_UNSHARE
> +
> +static void run(void)
> +{
> + const char* chroot_dir = "chroot";
> + const char* new_root = "/new_root";
> +
> + // EINVAL
> + // put_old is not underneath new_root
> + // Note: if put_old and new_root are on the same fs,
> + // pivot_root fails with EBUSY before testing reachability
> + const char* put_old_fs = "/put_old_fs";
> + const char* put_old = "/put_old_fs/put_old";
> +
> + int pid;
> +
> + if ((pid = SAFE_FORK()) == -1) {
> + tst_brk(TBROK, "Could not fork");
> + }
> +
> + if (pid == 0) {
> + if (unshare(CLONE_NEWNS | CLONE_FS)) {
> + tst_res(TFAIL | TERRNO, "unshare failed");
> + exit (1);
> + }
> +
> + SAFE_MOUNT("none", "/", NULL, MS_REC|MS_PRIVATE, NULL);
> + SAFE_MKDIR(chroot_dir, 0777);
> + SAFE_MOUNT("none", chroot_dir, "tmpfs", 0, 0);
> + SAFE_CHROOT(chroot_dir);
> + SAFE_MKDIR(new_root, 0777);
> + SAFE_MOUNT("none", new_root, "tmpfs", 0, 0);
> +
> + SAFE_MKDIR(put_old_fs, 0777);
> + SAFE_MOUNT("none", put_old_fs, "tmpfs", 0, 0);
> + SAFE_MKDIR(put_old, 0777);
> +
> + if (syscall(__NR_pivot_root, new_root, put_old) == 0) {
> + tst_res(TFAIL, "pivot_root succeeded unexpectedly");
> + exit (1);
> + }
> +
> + if (errno != EINVAL) {
> + tst_res(TFAIL | TERRNO,
> + "pivot_root failed with wrong errno");
> + exit (1);
> + }
> +
> + tst_res(TPASS, "pivot_root failed with EINVAL as expected");
> + exit(0);
> + }
> +
> + tst_reap_children();
> +}
> +
> +#else
> +static void run(void)
> +{
> + tst_brk(TCONF, NULL, "unshare is undefined.");
> +}
> +#endif
> +
> +static struct tst_test test = {
> + .test_all = run,
> + .needs_tmpdir = 1,
> + .needs_root = 1,
> + .forks_child = 1,
> +};
> diff --git a/testcases/kernel/syscalls/pivot_root/pivot_root05.c b/testcases/kernel/syscalls/pivot_root/pivot_root05.c
> new file mode 100644
> index 000000000..7f58fccfc
> --- /dev/null
> +++ b/testcases/kernel/syscalls/pivot_root/pivot_root05.c
> @@ -0,0 +1,76 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +//
> +// Copyright (c) 2019 Google, Inc.
> +
> +#define _GNU_SOURCE
> +
> +#include <errno.h>
> +#include <linux/unistd.h>
> +#include <sched.h>
> +#include <sys/mount.h>
> +#include <stdlib.h>
> +
> +#include "tst_test.h"
> +
> +#ifdef HAVE_UNSHARE
> +
> +static void run(void)
> +{
> + const char* chroot_dir = "chroot";
> + const char* new_root = "/new_root";
> + const char* put_old = "/new_root/put_old";
> +
> + int pid;
> +
> + if ((pid = SAFE_FORK()) == -1) {
> + tst_brk(TBROK, "Could not fork");
> + }
> +
> + if (pid == 0) {
> + if (unshare(CLONE_NEWNS | CLONE_FS)) {
> + tst_res(TFAIL | TERRNO, "unshare failed");
> + exit (1);
> + }
> +
> + SAFE_MOUNT("none", "/", NULL, MS_REC|MS_PRIVATE, NULL);
> + SAFE_MKDIR(chroot_dir, 0777);
> + SAFE_MOUNT("none", chroot_dir, "tmpfs", 0, 0);
> + SAFE_CHROOT(chroot_dir);
> + SAFE_MKDIR(new_root, 0777);
> + SAFE_MOUNT("none", new_root, "tmpfs", 0, 0);
> +
> + // ENOTDIR
> + // new_root or put_old is not a directory
> + SAFE_CREAT(put_old, 0777);
> +
> + if (syscall(__NR_pivot_root, new_root, put_old) == 0) {
> + tst_res(TFAIL, "pivot_root succeeded unexpectedly");
> + exit (1);
> + }
> +
> + if (errno != ENOTDIR) {
> + tst_res(TFAIL | TERRNO,
> + "pivot_root failed with wrong errno");
> + exit (1);
> + }
> +
> + tst_res(TPASS, "pivot_root failed with EBUSY as expected");
> + exit(0);
> + }
> +
> + tst_reap_children();
> +}
> +
> +#else
> +static void run(void)
> +{
> + tst_brk(TCONF, NULL, "unshare is undefined.");
> +}
> +#endif
> +
> +static struct tst_test test = {
> + .test_all = run,
> + .needs_tmpdir = 1,
> + .needs_root = 1,
> + .forks_child = 1,
> +};
> diff --git a/testcases/kernel/syscalls/pivot_root/pivot_root06.c b/testcases/kernel/syscalls/pivot_root/pivot_root06.c
> new file mode 100644
> index 000000000..ac3b08321
> --- /dev/null
> +++ b/testcases/kernel/syscalls/pivot_root/pivot_root06.c
> @@ -0,0 +1,94 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +//
> +// Copyright (c) 2019 Google, Inc.
> +
> +#define _GNU_SOURCE
> +
> +#include <errno.h>
> +#include <linux/unistd.h>
> +#include <sched.h>
> +#include <sys/capability.h>
> +#include <sys/mount.h>
> +#include <stdlib.h>
> +
> +#include "tst_test.h"
> +
> +#ifdef HAVE_UNSHARE
> +
> +static void run(void)
> +{
> + const char* chroot_dir = "chroot";
> + const char* new_root = "/new_root";
> + const char* put_old = "/new_root/put_old";
> +
> + int pid;
> +
> + if ((pid = SAFE_FORK()) == -1) {
> + tst_brk(TBROK, "Could not fork");
> + }
> +
> +
> + if (pid == 0) {
> + if (unshare(CLONE_NEWNS | CLONE_FS)) {
> + tst_res(TFAIL | TERRNO, "unshare failed");
> + exit (1);
> + }
> +
> + SAFE_MOUNT("none", "/", NULL, MS_REC|MS_PRIVATE, NULL);
> + SAFE_MKDIR(chroot_dir, 0777);
> + SAFE_MOUNT("none", chroot_dir, "tmpfs", 0, 0);
> + SAFE_CHROOT(chroot_dir);
> + SAFE_MKDIR(new_root, 0777);
> + SAFE_MOUNT("none", new_root, "tmpfs", 0, 0);
> + SAFE_MKDIR(put_old, 0777);
> +
> + // EPERM
> + // The calling process does not have the CAP_SYS_ADMIN capability.
> + cap_value_t cap_value[] = { CAP_SYS_ADMIN };
> + cap_t cap = cap_get_proc();
> + if (!cap) {
> + tst_res(TFAIL | TERRNO, "cap_get_proc failed");
> + exit (1);
> + }
> +
> + if (cap_set_flag(cap, CAP_EFFECTIVE, 1, cap_value, CAP_CLEAR)) {
> + tst_res(TFAIL | TERRNO, "cap_set_flag failed");
> + exit (1);
> + }
> +
> + if (cap_set_proc(cap)) {
> + tst_res(TFAIL | TERRNO, "cap_set_proc failed");
> + exit (1);
> + }
> +
> + if (syscall(__NR_pivot_root, new_root, put_old) == 0) {
> + tst_res(TFAIL, "pivot_root succeeded unexpectedly");
> + exit (1);
> + }
> +
> + if (errno != EPERM) {
> + tst_res(TFAIL | TERRNO,
> + "pivot_root failed with wrong errno");
> + exit (1);
> + }
> +
> + tst_res(TPASS, "pivot_root failed with EPERM as expected");
> + exit(0);
> + }
> +
> + tst_reap_children();
> +}
> +
> +#else
> +static void run(void)
> +{
> + tst_brk(TCONF, NULL, "unshare is undefined.");
> +}
> +#endif
> +
> +static struct tst_test test = {
> + .test_all = run,
> + .needs_tmpdir = 1,
> + .needs_root = 1,
> + .forks_child = 1,
> +};
> --
> 2.21.0.352.gf09ad66450-goog
Cheers,
Matthias
^ permalink raw reply [flat|nested] 4+ messages in thread
* [LTP] [PATCH] Add ltp pivot_root test
@ 2019-03-19 22:31 Paul Lawrence
2019-03-20 15:28 ` Cyril Hrubis
0 siblings, 1 reply; 4+ messages in thread
From: Paul Lawrence @ 2019-03-19 22:31 UTC (permalink / raw)
To: ltp
Signed-off-by: Paul Lawrence <paullawrence@google.com>
---
runtest/syscalls | 2 +
testcases/kernel/syscalls/pivot_root/Makefile | 11 +
.../kernel/syscalls/pivot_root/pivot_root01.c | 193 ++++++++++++++++++
3 files changed, 206 insertions(+)
create mode 100644 testcases/kernel/syscalls/pivot_root/Makefile
create mode 100644 testcases/kernel/syscalls/pivot_root/pivot_root01.c
diff --git a/runtest/syscalls b/runtest/syscalls
index 668c87cd1..debda74b8 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -835,6 +835,8 @@ pipe11 pipe11
pipe2_01 pipe2_01
pipe2_02 pipe2_02
+pivot_root01 pivot_root01
+
poll01 poll01
poll02 poll02
diff --git a/testcases/kernel/syscalls/pivot_root/Makefile b/testcases/kernel/syscalls/pivot_root/Makefile
new file mode 100644
index 000000000..6a3810270
--- /dev/null
+++ b/testcases/kernel/syscalls/pivot_root/Makefile
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright (c) 2019 Google, Inc.
+
+top_srcdir ?= ../../../..
+
+include $(top_srcdir)/include/mk/testcases.mk
+
+LDLIBS += $(CAP_LIBS)
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/pivot_root/pivot_root01.c b/testcases/kernel/syscalls/pivot_root/pivot_root01.c
new file mode 100644
index 000000000..d5f2bd1ca
--- /dev/null
+++ b/testcases/kernel/syscalls/pivot_root/pivot_root01.c
@@ -0,0 +1,193 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+//
+// Copyright (c) 2019 Google, Inc.
+
+#define _GNU_SOURCE
+
+#include "config.h"
+
+#include <errno.h>
+#include <lapi/syscalls.h>
+#include <sched.h>
+
+#include <sys/mount.h>
+#include <stdlib.h>
+
+#include "tst_test.h"
+
+#ifdef HAVE_UNSHARE
+
+#ifdef HAVE_LIBCAP
+#include <sys/capability.h>
+#endif
+
+#define CHROOT_DIR "chroot"
+#define NEW_ROOT "/new_root"
+#define PUT_OLD "/new_root/put_old"
+#define PUT_OLD_FS "/put_old_fs"
+#define PUT_OLD_BAD "/put_old_fs/put_old"
+
+enum {
+ /*
+ * Test consists of a series of steps that allow pivot_root to succeed,
+ * which is run when param is NORMAL. All other values tweak one of the
+ * steps to induce a failure, and check the errno is as expected.
+ */
+ NORMAL,
+
+ /*
+ * EBUSY
+ * new_root or put_old are on the current root file system
+ */
+ NEW_ROOT_ON_CURRENT_ROOT,
+
+ /*
+ * EINVAL
+ * put_old is not underneath new_root
+ * Note: if put_old and new_root are on the same fs,
+ * pivot_root fails with EBUSY before testing reachability
+ */
+ PUT_OLD_NOT_UNDERNEATH_NEW_ROOT,
+
+ /*
+ * ENOTDIR
+ * new_root or put_old is not a directory
+ */
+ PUT_OLD_NOT_DIR,
+
+ /*
+ * EPERM
+ * The calling process does not have the CAP_SYS_ADMIN capability.
+ */
+ NO_CAP_SYS_ADMIN,
+};
+
+static const struct test_case {
+ int test_case;
+ int expected_error;
+} test_cases[] = {
+ {NORMAL, 0},
+ {NEW_ROOT_ON_CURRENT_ROOT, EBUSY},
+ {PUT_OLD_NOT_UNDERNEATH_NEW_ROOT, EINVAL},
+ {PUT_OLD_NOT_DIR, ENOTDIR},
+ {NO_CAP_SYS_ADMIN, EPERM},
+};
+
+#ifdef HAVE_LIBCAP
+static void drop_cap_sys_admin(void)
+{
+ cap_value_t cap_value[] = { CAP_SYS_ADMIN };
+ cap_t cap = cap_get_proc();
+ if (!cap)
+ tst_brk(TFAIL | TERRNO, "cap_get_proc failed");
+
+ if (cap_set_flag(cap, CAP_EFFECTIVE, 1, cap_value, CAP_CLEAR))
+ tst_brk(TFAIL | TERRNO, "cap_set_flag failed");
+
+ if (cap_set_proc(cap))
+ tst_brk(TFAIL | TERRNO, "cap_set_proc failed");
+}
+#endif
+
+static void run(unsigned int test_case)
+{
+ /* Work in child process - needed to undo unshare and chroot */
+ if (SAFE_FORK()) {
+ tst_reap_children();
+ return;
+ }
+
+ /* pivot_root requires no shared mounts exist in process namespace */
+ TEST(unshare(CLONE_NEWNS | CLONE_FS));
+ if (TST_RET == -1)
+ tst_brk(TFAIL | TERRNO, "unshare failed");
+
+ /*
+ * Create an initial root dir. pivot_root doesn't work if the initial root
+ * dir is a initramfs, so use chroot to create a safe environment
+ */
+ SAFE_MOUNT("none", "/", NULL, MS_REC|MS_PRIVATE, NULL);
+ SAFE_MOUNT("none", CHROOT_DIR, "tmpfs", 0, 0);
+ SAFE_CHROOT(CHROOT_DIR);
+
+ SAFE_MKDIR(NEW_ROOT, 0777);
+
+ /*
+ * pivot_root only works if new_root is a mount point, so mount a tmpfs
+ * unless testing for that fail mode
+ */
+ if (test_cases[test_case].test_case != NEW_ROOT_ON_CURRENT_ROOT)
+ SAFE_MOUNT("none", NEW_ROOT, "tmpfs", 0, 0);
+
+ /*
+ * Create put_old under new_root, unless testing for that specific fail
+ * mode
+ */
+ const char* actual_put_old = NULL;
+ if (test_cases[test_case].test_case == PUT_OLD_NOT_UNDERNEATH_NEW_ROOT) {
+ actual_put_old = PUT_OLD_BAD;
+ SAFE_MKDIR(PUT_OLD_FS, 0777);
+ SAFE_MOUNT("none", PUT_OLD_FS, "tmpfs", 0, 0);
+ SAFE_MKDIR(PUT_OLD_BAD, 0777);
+ } else {
+ actual_put_old = PUT_OLD;
+
+ if (test_cases[test_case].test_case == PUT_OLD_NOT_DIR)
+ SAFE_CREAT(PUT_OLD, 0777);
+ else
+ SAFE_MKDIR(PUT_OLD, 0777);
+ }
+
+ if (test_cases[test_case].test_case == NO_CAP_SYS_ADMIN) {
+#ifdef HAVE_LIBCAP
+ drop_cap_sys_admin();
+#else
+ tst_res(TCONF,
+ "System doesn't have POSIX capabilities support");
+ return;
+#endif
+ }
+
+ TEST(syscall(__NR_pivot_root, NEW_ROOT, actual_put_old));
+
+ if (test_cases[test_case].test_case == NORMAL) {
+ if (TST_RET) {
+ tst_res(TFAIL | TERRNO, "pivot_root failed");
+ return;
+ } else {
+ tst_res(TPASS, "pivot_root succeeded");
+ return;
+ }
+ }
+
+ if (TST_RET == 0) {
+ tst_res(TFAIL, "pivot_root succeeded unexpectedly");
+ return;
+ }
+
+ if (errno != test_cases[test_case].expected_error) {
+ tst_res(TFAIL | TERRNO, "pivot_root failed with wrong errno");
+ return;
+ }
+
+ tst_res(TPASS, "pivot_root failed as expected with %s",
+ strerror(errno));
+}
+
+static void setup(void)
+{
+ SAFE_MKDIR(CHROOT_DIR, 0777);
+}
+
+static struct tst_test test = {
+ .test = run,
+ .tcnt = ARRAY_SIZE(test_cases),
+ .needs_tmpdir = 1,
+ .needs_root = 1,
+ .forks_child = 1,
+ .setup = setup,
+};
+
+#else
+ TST_TEST_TCONF("unshare is undefined.");
+#endif
--
2.21.0.225.g810b269d1ac-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [LTP] [PATCH] Add ltp pivot_root test
2019-03-19 22:31 Paul Lawrence
@ 2019-03-20 15:28 ` Cyril Hrubis
0 siblings, 0 replies; 4+ messages in thread
From: Cyril Hrubis @ 2019-03-20 15:28 UTC (permalink / raw)
To: ltp
Hi!
Pushed with minor changes, thanks.
* Added .gitignore for the pivot_root01 binary
* Changed tst_brk(TFAIL, ...) to tst_brk(TBROK, ...)
(see https://github.com/linux-test-project/ltp/issues/462)
* Made use of TERRNO flag instead of strerror(), we avoid using
strerror() since it produces localized sentencies instead of
errno symbolic names. Instead we use either TERRNO or tst_strerrno()
function.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-03-20 15:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-28 19:36 [LTP] [PATCH] Add ltp pivot_root test Paul Lawrence
2019-03-01 9:24 ` Matthias =?unknown-8bit?q?M=C3=A4nnich?=
-- strict thread matches above, loose matches on Subject: below --
2019-03-19 22:31 Paul Lawrence
2019-03-20 15:28 ` Cyril Hrubis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox