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

logind: fix potential fd leak in deliver_session_leader_fd_consume()

Browse Source 
Follow-up for 45eea629e3
This commit is contained in:
Mike Yuan
2025-11-06 19:31:56 +01:00
parent 7b3046e693
commit c54112bdee
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/login/logind.c
+4 -3
View File
@@ -441,13 +441,13 @@ static int deliver_session_device_fd(Session *s, const char *fdname, int fd, dev
return 0;
}
static int deliver_session_leader_fd_consume(Session *s, const char *fdname, int fd) {
static int deliver_session_leader_fd_consume(Session *s, const char *fdname, int fd_consume) {
_cleanup_close_ int fd = ASSERT_FD(fd_consume);
_cleanup_(pidref_done) PidRef leader_fdstore = PIDREF_NULL;
int r;
assert(s);
assert(fdname);
assert(fd >= 0);
/* Already deserialized via pidfd id? */
if (pidref_is_set(&s->leader)) {
@@ -479,6 +479,7 @@ static int deliver_session_leader_fd_consume(Session *s, const char *fdname, int
log_warning_errno(r, "Failed to create reference to leader of session '%s': %m", s->id);
goto fail_close;
}
TAKE_FD(fd);
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.",
@@ -491,7 +492,7 @@ static int deliver_session_leader_fd_consume(Session *s, const char *fdname, int
return 0;
fail_close:
close_and_notify_warn(fd, fdname);
close_and_notify_warn(TAKE_FD(fd), fdname);
return r;
}