picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nspawn: don't accept just any tree to execute 

When invoked without -D in an arbitrary directory we should not try to
execute anything, make some validity checks first.
This commit is contained in:
Lennart Poettering 2014-02-14 16:35:18 +01:00
parent 9fccdb0f64
commit 6b9132a9c4
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/nspawn/nspawn.c
View File

@ -1555,9 +1555,21 @@ int main(int argc, char *argv[]) {
goto finish;
}
if (arg_boot && path_is_os_tree(arg_directory) <= 0) {
log_error("Directory %s doesn't look like an OS root directory (/etc/os-release is missing). Refusing.", arg_directory);
goto finish;
if (arg_boot) {
if (path_is_os_tree(arg_directory) <= 0) {
log_error("Directory %s doesn't look like an OS root directory (/etc/os-release is missing). Refusing.", arg_directory);
goto finish;
}
} else {
const char *p;
p = strappenda(arg_directory,
argc > optind && path_is_absolute(argv[optind]) ? argv[optind] : "/usr/bin/");
if (access(p, F_OK) < 0) {
log_error("Directory %s lacks the binary to execute or doesn't look like a binary tree. Refusing.", arg_directory);
goto finish;
}
}
log_close();