dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

nspawn: fix two failure paths

Browse Source 
We need to go to "finish" rather than just return.

All our exit paths got this right, except two.
This commit is contained in:
Lennart Poettering
2023-11-03 09:42:53 +01:00
parent b75b8e1d02
commit 41de458aed
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nspawn/nspawn.c
View File

@@ -5659,8 +5659,10 @@ static int run(int argc, char *argv[]) {
if (arg_pivot_root_new) {
b = path_join(arg_directory, arg_pivot_root_new);
if (!b)
return log_oom();
if (!b) {
r = log_oom();
goto finish;
}
p = b;
} else
@@ -5678,8 +5680,10 @@ static int run(int argc, char *argv[]) {
p = path_join(arg_directory, arg_pivot_root_new, "/usr/");
else
p = path_join(arg_directory, "/usr/");
if (!p)
return log_oom();
if (!p) {
r = log_oom();
goto finish;
}
if (laccess(p, F_OK) < 0) {
r = log_error_errno(SYNTHETIC_ERRNO(EINVAL),