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

core/exec-invoke: use RET_NERRNO to avoid clobbering errno

Browse Source 
Follow-up for 72ce1046e8

string_table_lookup_to_string_fallback() might interfere
with errno, hence store it in r first.
This commit is contained in:
Mike Yuan
2025-12-31 19:32:58 +01:00
parent f5530c10b8
commit d7bc1e3be9
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/exec-invoke.c
+6 -9
View File
@@ -5471,17 +5471,14 @@ int exec_invoke(
.sched_flags = context->cpu_sched_reset_on_fork ? SCHED_FLAG_RESET_ON_FORK : 0,
};
r = sched_setattr(/* pid= */ 0, &attr, /* flags= */ 0);
if (r < 0) {
if (errno != EINVAL || sched_policy_supported(attr.sched_policy)) {
*exit_status = EXIT_SETSCHEDULER;
return log_error_errno(errno, "Failed to set up CPU scheduling: %m");
}
r = RET_NERRNO(sched_setattr(/* pid= */ 0, &attr, /* flags= */ 0));
if (r == -EINVAL && !sched_policy_supported(context->cpu_sched_policy)) {
_cleanup_free_ char *s = NULL;
(void) sched_policy_to_string_alloc(context->cpu_sched_policy, &s);
log_warning_errno(errno, "CPU scheduling policy %s is not supported, proceeding without.", strna(s));
log_warning_errno(r, "CPU scheduling policy %s is not supported, proceeding without.", strna(s));
} else if (r < 0) {
*exit_status = EXIT_SETSCHEDULER;
return log_error_errno(r, "Failed to set up CPU scheduling: %m");
}
}