SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mount-util: drop unused remount_and_move_sub_mounts()

Browse Source
This commit is contained in:
Yu Watanabe
2023-08-22 23:21:43 +09:00
parent 553e366086
commit 2b60ce545c
3 changed files with 3 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-mount-util.c
+1 -144
View File
@@ -25,136 +25,6 @@
#include "tests.h"
#include "tmpfile-util.h"
TEST(remount_and_move_sub_mounts) {
int r;
if (geteuid() != 0 || have_effective_cap(CAP_SYS_ADMIN) <= 0)
return (void) log_tests_skipped("not running privileged");
r = safe_fork("(remount-and-move-sub-mounts)",
FORK_RESET_SIGNALS |
FORK_CLOSE_ALL_FDS |
FORK_DEATHSIG |
FORK_WAIT |
FORK_REOPEN_LOG |
FORK_LOG |
FORK_NEW_MOUNTNS |
FORK_MOUNTNS_SLAVE,
NULL);
assert_se(r >= 0);
if (r == 0) {
_cleanup_free_ char *d = NULL, *fn = NULL;
assert_se(mkdtemp_malloc(NULL, &d) >= 0);
assert_se(mount_nofollow_verbose(LOG_DEBUG, "tmpfs", d, "tmpfs", MS_NOSUID|MS_NODEV, NULL) >= 0);
assert_se(fn = path_join(d, "memo"));
assert_se(write_string_file(fn, d, WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_AVOID_NEWLINE) >= 0);
assert_se(access(fn, F_OK) >= 0);
/* Create fs tree */
FOREACH_STRING(p, "sub1", "sub1/hoge", "sub1/foo", "sub2", "sub2/aaa", "sub2/bbb") {
_cleanup_free_ char *where = NULL, *filename = NULL;
assert_se(where = path_join(d, p));
assert_se(mkdir_p(where, 0755) >= 0);
assert_se(mount_nofollow_verbose(LOG_DEBUG, "tmpfs", where, "tmpfs", MS_NOSUID|MS_NODEV, NULL) >= 0);
assert_se(filename = path_join(where, "memo"));
assert_se(write_string_file(filename, where, WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_AVOID_NEWLINE) >= 0);
assert_se(access(filename, F_OK) >= 0);
}
/* Hide sub1. */
FOREACH_STRING(p, "sub1", "sub1/hogehoge", "sub1/foofoo") {
_cleanup_free_ char *where = NULL, *filename = NULL;
assert_se(where = path_join(d, p));
assert_se(mkdir_p(where, 0755) >= 0);
assert_se(mount_nofollow_verbose(LOG_DEBUG, "tmpfs", where, "tmpfs", MS_NOSUID|MS_NODEV, NULL) >= 0);
assert_se(filename = path_join(where, "memo"));
assert_se(write_string_file(filename, where, WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_AVOID_NEWLINE) >= 0);
assert_se(access(filename, F_OK) >= 0);
}
/* Remount the main fs. */
r = remount_and_move_sub_mounts("tmpfs", d, "tmpfs", MS_NOSUID|MS_NODEV, NULL);
if (r == -EINVAL || (r < 0 && ERRNO_IS_NOT_SUPPORTED(r))) {
log_tests_skipped_errno(r, "The kernel seems too old: %m");
_exit(EXIT_SUCCESS);
}
/* Check the file in the main fs does not exist. */
assert_se(access(fn, F_OK) < 0 && errno == ENOENT);
/* Check the files in sub-mounts are kept. */
FOREACH_STRING(p, "sub1", "sub1/hogehoge", "sub1/foofoo", "sub2", "sub2/aaa", "sub2/bbb") {
_cleanup_free_ char *where = NULL, *filename = NULL, *content = NULL;
assert_se(where = path_join(d, p));
assert_se(filename = path_join(where, "memo"));
assert_se(read_full_file(filename, &content, NULL) >= 0);
assert_se(streq(content, where));
}
/* umount sub1, and check if the previously hidden sub-mounts are dropped. */
FOREACH_STRING(p, "sub1/hoge", "sub1/foo") {
_cleanup_free_ char *where = NULL;
assert_se(where = path_join(d, p));
assert_se(access(where, F_OK) < 0 && errno == ENOENT);
}
_exit(EXIT_SUCCESS);
}
}
TEST(remount_sysfs) {
int r;
if (geteuid() != 0 || have_effective_cap(CAP_SYS_ADMIN) <= 0)
return (void) log_tests_skipped("not running privileged");
if (path_is_fs_type("/sys", SYSFS_MAGIC) <= 0)
return (void) log_tests_skipped("sysfs is not mounted on /sys");
if (access("/sys/class/net/dummy-test-mnt", F_OK) < 0)
return (void) log_tests_skipped_errno(errno, "The network interface dummy-test-mnt does not exit");
r = safe_fork("(remount-sysfs)",
FORK_RESET_SIGNALS |
FORK_CLOSE_ALL_FDS |
FORK_DEATHSIG |
FORK_WAIT |
FORK_REOPEN_LOG |
FORK_LOG |
FORK_NEW_MOUNTNS |
FORK_MOUNTNS_SLAVE,
NULL);
assert_se(r >= 0);
if (r == 0) {
assert_se(unshare(CLONE_NEWNET) >= 0);
/* Even unshare()ed, the interfaces in the main namespace can be accessed through sysfs. */
assert_se(access("/sys/class/net/lo", F_OK) >= 0);
assert_se(access("/sys/class/net/dummy-test-mnt", F_OK) >= 0);
r = remount_sysfs("/sys");
if (r == -EINVAL || (r < 0 && ERRNO_IS_NOT_SUPPORTED(r))) {
log_tests_skipped_errno(r, "The kernel seems too old: %m");
_exit(EXIT_SUCCESS);
}
/* After remounting sysfs, the interfaces in the main namespace cannot be accessed. */
assert_se(access("/sys/class/net/lo", F_OK) >= 0);
assert_se(access("/sys/class/net/dummy-test-mnt", F_OK) < 0 && errno == ENOENT);
_exit(EXIT_SUCCESS);
}
}
TEST(mount_option_mangle) {
char *opts = NULL;
unsigned long f;
@@ -636,17 +506,4 @@ TEST(bind_mount_submounts) {
assert_se(umount_recursive(b, 0) >= 0);
}
static int intro(void) {
/* Create a dummy network interface for testing remount_sysfs(). */
(void) system("ip link add dummy-test-mnt type dummy");
return 0;
}
static int outro(void) {
(void) system("ip link del dummy-test-mnt");
return 0;
}
DEFINE_TEST_MAIN_FULL(LOG_DEBUG, intro, outro);
DEFINE_TEST_MAIN(LOG_DEBUG);