shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-08-26 17:49:52 +03:00
Code Activity

logind: don't use assertion for deserialized_pid

Browse Source 
Follow-up for 9d5b690100

Otherwise if session_load() went wrong, and we got pidfd
from fdstore, the assertion is triggered.
This commit is contained in:
Mike Yuan
2024-01-06 01:47:20 +08:00
committed by Yu Watanabe
parent 7980c6316a
commit 307b6a4dab
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/login/logind.c
View File

@ -438,6 +438,13 @@ static int deliver_session_leader_fd_consume(Session *s, const char *fdname, int
assert(fdname);
assert(fd >= 0);
if (!pid_is_valid(s->deserialized_pid)) {
r = log_warning_errno(SYNTHETIC_ERRNO(EOWNERDEAD),
"Got leader pidfd for session '%s', but LEADER= is not set, refusing.",
s->id);
goto fail_close;
}
if (!s->leader_fd_saved)
log_warning("Got leader pidfd for session '%s', but not recorded in session state, proceeding anyway.",
s->id);
@ -450,13 +457,9 @@ static int deliver_session_leader_fd_consume(Session *s, const char *fdname, int
log_debug_errno(r, "Leader of session '%s' is gone while deserializing.", s->id);
else
log_warning_errno(r, "Failed to create reference to leader of session '%s': %m", s->id);
close_and_notify_warn(fd, fdname);
return r;
goto fail_close;
}
assert(pid_is_valid(s->deserialized_pid));
if (leader_fdstore.pid != s->deserialized_pid)
log_warning("Leader from pidfd (" PID_FMT ") doesn't match with LEADER=" PID_FMT " for session '%s', proceeding anyway.",
leader_fdstore.pid, s->deserialized_pid, s->id);
@ -466,6 +469,10 @@ static int deliver_session_leader_fd_consume(Session *s, const char *fdname, int
return log_warning_errno(r, "Failed to attach leader pidfd for session '%s': %m", s->id);
return 0;
fail_close:
close_and_notify_warn(fd, fdname);
return r;
}
static int manager_attach_session_fd_one_consume(Manager *m, const char *fdname, int fd) {