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

core/execute-serialize: do not gracefully skip unknown image policies in executor (#40062)

Browse Source
This commit is contained in:
Mike Yuan
2025-12-12 16:20:14 +01:00
committed by GitHub
parent 0859fe3f32 cc317bb82f
commit 7524671f74
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/execute-serialize.c
+3 -3
View File
@@ -3740,21 +3740,21 @@ static int exec_context_deserialize(ExecContext *c, FILE *f) {
if (c->root_image_policy)
return -EINVAL; /* duplicated */
r = image_policy_from_string(val, /* graceful= */ true, &c->root_image_policy);
r = image_policy_from_string(val, /* graceful= */ false, &c->root_image_policy);
if (r < 0)
return r;
} else if ((val = startswith(l, "exec-context-mount-image-policy="))) {
if (c->mount_image_policy)
return -EINVAL; /* duplicated */
r = image_policy_from_string(val, /* graceful= */ true, &c->mount_image_policy);
r = image_policy_from_string(val, /* graceful= */ false, &c->mount_image_policy);
if (r < 0)
return r;
} else if ((val = startswith(l, "exec-context-extension-image-policy="))) {
if (c->extension_image_policy)
return -EINVAL; /* duplicated */
r = image_policy_from_string(val, /* graceful= */ true, &c->extension_image_policy);
r = image_policy_from_string(val, /* graceful= */ false, &c->extension_image_policy);
if (r < 0)
return r;
} else
src/shared/image-policy.c
+2 -2
View File
@@ -231,7 +231,7 @@ PartitionPolicyFlags partition_policy_flags_from_string(const char *s, bool grac
ff = policy_flag_from_string_one(strstrip(f));
if (ff < 0) {
if (graceful) {
log_debug("Unknown partition policy flag: %s, ignoring", f);
log_debug("Unknown partition policy flag, ignoring: %s", f);
continue;
}
return -EBADRQC; /* recognizable error */
@@ -345,7 +345,7 @@ int image_policy_from_string(const char *s, bool graceful, ImagePolicy **ret) {
if (!graceful)
return log_debug_errno(SYNTHETIC_ERRNO(EBADSLT), "Unknown partition designator: %s", ds); /* recognizable error */
log_debug("Unknown partition designator: %s, ignoring", ds);
log_debug("Unknown partition designator, ignoring: %s", ds);
continue;
}
if (dmask & (UINT64_C(1) << designator))