Skip to content

fix(control): fix grouped VT leak on destroy request #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zccrs merged 1 commit into from
Jul 13, 2026
Merged

fix(control): fix grouped VT leak on destroy request #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions seatd/control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,13 +226,6 @@ static int handle_destroy_group_vt(struct control_client *client) {
if (seat == NULL) {
return control_send_error(client, ENOENT);
}
pid_t owner_pid = -1;
if (seat_get_group_vt_owner_pid(seat, request.vt, &owner_pid) == -1) {
return control_send_error(client, errno);
}
if (owner_pid != client->pid) {
return control_send_error(client, EPERM);
}
if (seat_destroy_group_vt(seat, request.vt) == -1) {
return control_send_error(client, errno);
}
Expand Down Expand Up @@ -322,9 +315,6 @@ static int control_client_handle_connection(int fd, uint32_t mask, void *data) {
if (mask & EVENT_ERROR) {
goto fail;
}
if (mask & EVENT_HANGUP) {
goto fail;
}

if (mask & EVENT_WRITABLE) {
int len = connection_flush(&client->connection);
Expand All @@ -337,6 +327,7 @@ static int control_client_handle_connection(int fd, uint32_t mask, void *data) {
}
}

/* Process readable data BEFORE acting on HANGUP. */
if (mask & EVENT_READABLE) {
int len = connection_read(&client->connection);
if (len == -1 && errno != EAGAIN) {
Expand All @@ -358,6 +349,11 @@ static int control_client_handle_connection(int fd, uint32_t mask, void *data) {
}
}

/* All readable data has been consumed. Now honour the hangup. */
if (mask & EVENT_HANGUP) {
goto fail;
}

return 0;

fail:
Expand Down
Loading