shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-03 01:17:45 +03:00
Code

run: do not validate exe early if MountImages/ExtensionImages are used

Browse Source 
Same as with RootImage&friends, the executable might be in the
image, so it's not visible in the host before the unit is set up.
This commit is contained in:
Luca Boccassi 2021-10-27 11:59:19 +01:00 committed by Yu Watanabe
parent 99987084f6
commit 69e0830994
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/run/run.c
View File

@ -1698,6 +1698,21 @@ static int start_transient_trigger(
return 0; return 0;
} }
static bool shall_make_executable_absolute(void) {
const char *f;
if (strv_isempty(arg_cmdline))
return false;
if (arg_transport != BUS_TRANSPORT_LOCAL)
return false;
FOREACH_STRING(f, "RootDirectory=", "RootImage=", "ExecSearchPath=", "MountImages=", "ExtensionImages=")
if (strv_find_startswith(arg_property, f))
return false;
return true;
}
static int run(int argc, char* argv[]) { static int run(int argc, char* argv[]) {
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
_cleanup_free_ char *description = NULL; _cleanup_free_ char *description = NULL;
@ -1711,11 +1726,7 @@ static int run(int argc, char* argv[]) {
if (r <= 0) if (r <= 0)
return r; return r;
if (!strv_isempty(arg_cmdline) && if (shall_make_executable_absolute()) {
arg_transport == BUS_TRANSPORT_LOCAL &&
!strv_find_startswith(arg_property, "RootDirectory=") &&
!strv_find_startswith(arg_property, "ExecSearchPath=") &&
!strv_find_startswith(arg_property, "RootImage=")) {
/* Patch in an absolute path to fail early for user convenience, but only when we can do it /* Patch in an absolute path to fail early for user convenience, but only when we can do it
* (i.e. we will be running from the same file system). This also uses the user's $PATH, * (i.e. we will be running from the same file system). This also uses the user's $PATH,
* while we use a fixed search path in the manager. */ * while we use a fixed search path in the manager. */