53 lines
2.3 KiB
Diff
53 lines
2.3 KiB
Diff
From 5763844219e88a993d1b93653585bc68e909353c Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Fri, 14 Aug 2020 21:50:55 +0200
|
|
Subject: [PATCH] test: accept that char device 0/0 can now be created witout
|
|
privileges
|
|
|
|
Fixes: #16721
|
|
|
|
(cherry picked from commit 5b5ce6298e5a1c09beacd5c963e2350979cbf94a)
|
|
|
|
Related: #2024903
|
|
---
|
|
src/test/test-fs-util.c | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c
|
|
index e3338ea440..aa32629f62 100644
|
|
--- a/src/test/test-fs-util.c
|
|
+++ b/src/test/test-fs-util.c
|
|
@@ -518,8 +518,8 @@ static void test_touch_file(void) {
|
|
assert_se(timespec_load(&st.st_mtim) == test_mtime);
|
|
|
|
if (geteuid() == 0) {
|
|
- a = strjoina(p, "/cdev");
|
|
- r = mknod(a, 0775 | S_IFCHR, makedev(0, 0));
|
|
+ a = strjoina(p, "/bdev");
|
|
+ r = mknod(a, 0775 | S_IFBLK, makedev(0, 0));
|
|
if (r < 0 && errno == EPERM && detect_container() > 0) {
|
|
log_notice("Running in unprivileged container? Skipping remaining tests in %s", __func__);
|
|
return;
|
|
@@ -529,17 +529,17 @@ static void test_touch_file(void) {
|
|
assert_se(lstat(a, &st) >= 0);
|
|
assert_se(st.st_uid == test_uid);
|
|
assert_se(st.st_gid == test_gid);
|
|
- assert_se(S_ISCHR(st.st_mode));
|
|
+ assert_se(S_ISBLK(st.st_mode));
|
|
assert_se((st.st_mode & 0777) == 0640);
|
|
assert_se(timespec_load(&st.st_mtim) == test_mtime);
|
|
|
|
- a = strjoina(p, "/bdev");
|
|
- assert_se(mknod(a, 0775 | S_IFBLK, makedev(0, 0)) >= 0);
|
|
+ a = strjoina(p, "/cdev");
|
|
+ assert_se(mknod(a, 0775 | S_IFCHR, makedev(0, 0)) >= 0);
|
|
assert_se(touch_file(a, false, test_mtime, test_uid, test_gid, 0640) >= 0);
|
|
assert_se(lstat(a, &st) >= 0);
|
|
assert_se(st.st_uid == test_uid);
|
|
assert_se(st.st_gid == test_gid);
|
|
- assert_se(S_ISBLK(st.st_mode));
|
|
+ assert_se(S_ISCHR(st.st_mode));
|
|
assert_se((st.st_mode & 0777) == 0640);
|
|
assert_se(timespec_load(&st.st_mtim) == test_mtime);
|
|
}
|