SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/execute: Rename error_path -> reterr_path/ret_path per coding guidelines

Browse Source 
This is a non-functional change to ensure error_path used to print out the
offending mount causing an error follows coding guidelines.
This commit is contained in:
Ryan Wilson
2024-10-26 15:28:49 -07:00
parent 7354936ef7
commit e73c042be6
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/exec-invoke.c
+2 -2
View File
@@ -3040,7 +3040,7 @@ static int apply_mount_namespace(
ExecRuntime *runtime,
const char *memory_pressure_path,
bool needs_sandboxing,
char **error_path) {
char **reterr_path) {
_cleanup_(verity_settings_done) VeritySettings verity = VERITY_SETTINGS_DEFAULT;
_cleanup_strv_free_ char **empty_directories = NULL, **symlinks = NULL,
@@ -3249,7 +3249,7 @@ static int apply_mount_namespace(
.proc_subset = needs_sandboxing ? context->proc_subset : false,
};
r = setup_namespace(&parameters, error_path);
r = setup_namespace(&parameters, reterr_path);
/* If we couldn't set up the namespace this is probably due to a missing capability. setup_namespace() reports
* that with a special, recognizable error ENOANO. In this case, silently proceed, but only if exclusively
* sandboxing options were used, i.e. nothing such as RootDirectory= or BindMount= that would result in a
src/core/namespace.c
+15 -15
View File
@@ -1990,7 +1990,7 @@ static int create_symlinks_from_tuples(const char *root, char **strv_symlinks) {
return 0;
}
static void mount_entry_path_debug_string(const char *root, MountEntry *m, char **error_path) {
static void mount_entry_path_debug_string(const char *root, MountEntry *m, char **ret_path) {
assert(m);
/* Create a string suitable for debugging logs, stripping for example the local working directory.
@@ -2003,23 +2003,23 @@ static void mount_entry_path_debug_string(const char *root, MountEntry *m, char
*
* Note that this is an error path, so no OOM check is done on purpose. */
if (!error_path)
if (!ret_path)
return;
if (!mount_entry_path(m)) {
*error_path = NULL;
*ret_path = NULL;
return;
}
if (root) {
const char *e = startswith(mount_entry_path(m), root);
if (e) {
*error_path = strdup(e);
*ret_path = strdup(e);
return;
}
}
*error_path = strdup(mount_entry_path(m));
*ret_path = strdup(mount_entry_path(m));
return;
}
@@ -2027,7 +2027,7 @@ static int apply_mounts(
MountList *ml,
const char *root,
const NamespaceParameters *p,
char **error_path) {
char **reterr_path) {
_cleanup_fclose_ FILE *proc_self_mountinfo = NULL;
_cleanup_free_ char **deny_list = NULL;
@@ -2046,8 +2046,8 @@ static int apply_mounts(
if (!proc_self_mountinfo) {
r = -errno;
if (error_path)
*error_path = strdup("/proc/self/mountinfo");
if (reterr_path)
*reterr_path = strdup("/proc/self/mountinfo");
return log_debug_errno(r, "Failed to open /proc/self/mountinfo: %m");
}
@@ -2067,7 +2067,7 @@ static int apply_mounts(
* /tmp and /var/tmp. */
r = follow_symlink(!IN_SET(m->mode, MOUNT_EXTENSION_IMAGE, MOUNT_EXTENSION_DIRECTORY, MOUNT_PRIVATE_TMPFS) ? root : NULL, m);
if (r < 0) {
mount_entry_path_debug_string(root, m, error_path);
mount_entry_path_debug_string(root, m, reterr_path);
return r;
}
if (r == 0) {
@@ -2082,7 +2082,7 @@ static int apply_mounts(
/* Returns 1 if the mount should be post-processed, 0 otherwise */
r = apply_one_mount(root, m, p);
if (r < 0) {
mount_entry_path_debug_string(root, m, error_path);
mount_entry_path_debug_string(root, m, reterr_path);
return r;
}
m->state = r == 0 ? MOUNT_SKIPPED : MOUNT_APPLIED;
@@ -2114,7 +2114,7 @@ static int apply_mounts(
FOREACH_ARRAY(m, ml->mounts, ml->n_mounts) {
r = make_read_only(m, deny_list, proc_self_mountinfo);
if (r < 0) {
mount_entry_path_debug_string(root, m, error_path);
mount_entry_path_debug_string(root, m, reterr_path);
return r;
}
}
@@ -2128,7 +2128,7 @@ static int apply_mounts(
FOREACH_ARRAY(m, ml->mounts, ml->n_mounts) {
r = make_noexec(m, deny_list, proc_self_mountinfo);
if (r < 0) {
mount_entry_path_debug_string(root, m, error_path);
mount_entry_path_debug_string(root, m, reterr_path);
return r;
}
}
@@ -2138,7 +2138,7 @@ static int apply_mounts(
FOREACH_ARRAY(m, ml->mounts, ml->n_mounts) {
r = make_nosuid(m, proc_self_mountinfo);
if (r < 0) {
mount_entry_path_debug_string(root, m, error_path);
mount_entry_path_debug_string(root, m, reterr_path);
return r;
}
}
@@ -2195,7 +2195,7 @@ static bool home_read_only(
return false;
}
int setup_namespace(const NamespaceParameters *p, char **error_path) {
int setup_namespace(const NamespaceParameters *p, char **reterr_path) {
_cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
_cleanup_(dissected_image_unrefp) DissectedImage *dissected_image = NULL;
@@ -2747,7 +2747,7 @@ int setup_namespace(const NamespaceParameters *p, char **error_path) {
(void) base_filesystem_create(root, UID_INVALID, GID_INVALID);
/* Now make the magic happen */
r = apply_mounts(&ml, root, p, error_path);
r = apply_mounts(&ml, root, p, reterr_path);
if (r < 0)
return r;
src/core/namespace.h
+1 -1
View File
@@ -172,7 +172,7 @@ struct NamespaceParameters {
PrivateTmp private_tmp;
};
int setup_namespace(const NamespaceParameters *p, char **error_path);
int setup_namespace(const NamespaceParameters *p, char **reterr_path);
#define RUN_SYSTEMD_EMPTY "/run/systemd/empty"