Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test/zdtm: mount a new tmpfs into the zdtm /dev #2445

Merged
merged 1 commit into from
Jul 22, 2024
Merged

test/zdtm: mount a new tmpfs into the zdtm /dev #2445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions test/others/mnt-ext-dev/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ truncate -s 0 zdtm.loop
truncate -s 50M zdtm.loop
mkfs.ext4 -F zdtm.loop
dev=`losetup --find --show zdtm.loop`
mkdir -p ../../dev
cp -ap $dev ../../dev
Snorch marked this conversation as resolved.
Show resolved Hide resolved
export ZDTM_MNT_EXT_DEV=$dev
python3 ../../zdtm.py run $EXTRA_OPTS -t zdtm/static/mnt_ext_dev || ret=$?
losetup -d $dev
Expand Down
62 changes: 48 additions & 14 deletions test/zdtm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@ def traceit(f, e, a):
def clean_tests_root():
global tests_root
if tests_root and tests_root[0] == os.getpid():
subprocess.call(["./umount2", os.path.join(tests_root[1], "dev")])
os.rmdir(os.path.join(tests_root[1], "root/root"))
os.rmdir(os.path.join(tests_root[1], "root"))
os.rmdir(os.path.join(tests_root[1], "dev"))
os.rmdir(tests_root[1])


Expand All @@ -85,8 +88,18 @@ def make_tests_root():
tests_root = (os.getpid(), tempfile.mkdtemp("", "criu-root-", tmpdir))
atexit.register(clean_tests_root)
os.mkdir(os.path.join(tests_root[1], "root"))
os.chmod(tests_root[1], 0o777)
return os.path.join(tests_root[1], "root")
os.mkdir(os.path.join(tests_root[1], "root", "root"))
# The current file system can be mounted with nodev, so let's create a
# new tmpfs mount for /dev.
devpath = os.path.join(tests_root[1], "dev")
os.mkdir(devpath)
# zdtm wants to create files on this mount. User namespace tests are
# running with custom user and group mappings.
subprocess.check_call(["mount", "-t", "tmpfs", "criu-test-dev", devpath])
os.chmod(devpath, 0o777)
Dismissed Show dismissed Hide dismissed
os.chmod(tests_root[1], 0o755)

Check failure

Code scanning / CodeQL

Overly permissive file permissions High test

Overly permissive mask in chmod sets file to world readable.
Dismissed Show dismissed Hide dismissed
os.chmod(os.path.join(tests_root[1], "root"), 0o755)
Dismissed Show dismissed Hide dismissed
return os.path.join(tests_root[1], "root", "root"), os.path.join(tests_root[1], "dev")


# Report generation
Expand Down Expand Up @@ -182,15 +195,16 @@ def clean():

class ns_flavor:
__root_dirs = [
"/bin", "/sbin", "/etc", "/lib", "/lib64", "/dev", "/dev/pts",
"/dev/net", "/tmp", "/usr", "/proc", "/run"
"/bin", "/sbin", "/etc", "/lib", "/lib64", "/dev",
"/tmp", "/usr", "/proc", "/run"
]
__dev_dirs = ["pts", "net"]

def __init__(self, opts):
self.name = "ns"
self.ns = True
self.uns = False
self.root = make_tests_root()
self.root, self.devpath = make_tests_root()
self.root_mounted = False

def __copy_one(self, fname):
Expand Down Expand Up @@ -236,16 +250,19 @@ def __copy_libs(self, binary):
self.__copy_one(lib)

def __mknod(self, name, rdev=None):
name = "/dev/" + name
tdev = stat.S_IFCHR
if not rdev:
if not os.access(name, os.F_OK):
if not os.access(os.path.join("/dev", name), os.F_OK):
print("Skipping %s at root" % name)
return
else:
rdev = os.stat(name).st_rdev
s = os.stat(os.path.join("/dev", name))
rdev = s.st_rdev
if stat.S_ISBLK(s.st_mode):
tdev = stat.S_IFBLK

name = self.root + name
os.mknod(name, stat.S_IFCHR, rdev)
name = os.path.join(self.devpath, name)
os.mknod(name, tdev, rdev)
os.chmod(name, 0o666)

def __construct_root(self):
Expand All @@ -256,11 +273,18 @@ def __construct_root(self):
for ldir in ["/bin", "/sbin", "/lib", "/lib64"]:
os.symlink(".." + ldir, self.root + "/usr" + ldir)

def __construct_dev(self):
for dir in self.__dev_dirs:
os.mkdir(os.path.join(self.devpath, dir))
os.chmod(os.path.join(self.devpath, dir), 0o755)
Dismissed Show dismissed Hide dismissed
self.__mknod("tty", os.makedev(5, 0))
self.__mknod("null", os.makedev(1, 3))
self.__mknod("net/tun")
self.__mknod("rtc")
self.__mknod("autofs", os.makedev(10, 235))
ext_dev = os.getenv("ZDTM_MNT_EXT_DEV")
if ext_dev:
self.__mknod(os.path.basename(ext_dev))

def __copy_deps(self, deps):
for d in deps.split('|'):
Expand All @@ -283,6 +307,9 @@ def init(self, l_bins, x_bins):
self.__construct_root()
os.mknod(self.root + "/.constructed", stat.S_IFREG | 0o600)

if not os.access(self.devpath + "/.constructed", os.F_OK):
self.__construct_dev()
os.mknod(self.devpath + "/.constructed", stat.S_IFREG | 0o600)
for b in l_bins:
self.__copy_libs(b)
for b in x_bins:
Expand Down Expand Up @@ -480,6 +507,7 @@ def start(self):
if self.__flavor.ns:
env['ZDTM_NEWNS'] = "1"
env['ZDTM_ROOT'] = self.__flavor.root
env['ZDTM_DEV'] = self.__flavor.devpath
env['PATH'] = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"

if self.__flavor.uns:
Expand Down Expand Up @@ -587,12 +615,18 @@ def __getcropts(self):
return opts

def getdopts(self):
return self.__getcropts() + self.__freezer.getdopts(
) + self.__desc.get('dopts', '').split()
opts = self.__getcropts() + self.__freezer.getdopts() + \
self.__desc.get('dopts', '').split()
if self.__flavor.ns:
opts += ["--external", "mnt[/dev]:ZDTM_DEV"]
return opts

def getropts(self):
return self.__getcropts() + self.__freezer.getropts(
) + self.__desc.get('ropts', '').split()
opts = self.__getcropts() + self.__freezer.getropts() + \
self.__desc.get('ropts', '').split()
if self.__flavor.ns:
opts += ["--external", "mnt[ZDTM_DEV]:%s" % self.__flavor.devpath]
return opts

def unlink_pidfile(self):
self.__pid = 0
Expand Down
15 changes: 14 additions & 1 deletion test/zdtm/lib/ns.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
static int prepare_mntns(void)
{
int dfd, ret;
char *root, *criu_path;
char *root, *criu_path, *dev_path;
char path[PATH_MAX];

root = getenv("ZDTM_ROOT");
Expand All @@ -51,6 +51,19 @@
return -1;
}

dev_path = getenv("ZDTM_DEV");
if (dev_path) {
snprintf(path, sizeof(path), "%s/dev", root);
if (mount(dev_path, path, NULL, MS_BIND, NULL)) {
pr_perror("Unable to mount %s", path);

Check warning on line 58 in test/zdtm/lib/ns.c

View workflow job for this annotation

GitHub Actions / build

return -1;
}
if (mount(NULL, path, NULL, MS_PRIVATE, NULL)) {
pr_perror("Unable to mount %s", path);
return -1;
}
avagin marked this conversation as resolved.
Show resolved Hide resolved
}

criu_path = getenv("ZDTM_CRIU");
if (criu_path) {
snprintf(path, sizeof(path), "%s%s", root, criu_path);
Expand Down
Loading