Skip to content

Fix sudo helper stealing TTY input in mortal mode #3426

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

Open
exkrexpexfex wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −4
Open

Fix sudo helper stealing TTY input in mortal mode #3426

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions WinPort/src/Backend/SudoAskpassImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,10 +305,10 @@ class SudoAskpassScreen
_need_repaint = true;
}
}
}

if (_result != RES_PENDING) {
return _result == RES_OK;
}
if (_result != RES_PENDING) {
return _result == RES_OK;
}

if (_need_repaint) {
Expand Down
9 changes: 8 additions & 1 deletion WinPort/src/sudo/sudo_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,20 @@ namespace Sudo

int r = fork();
if (r == 0) {
// Keep cached sudo dispatcher out of the interactive TTY session: sudo's
// pty monitor can otherwise race far2l's own input reader while alive.
if (setsid() == -1) {
perror("setsid");
}

// sudo closes all descriptors except std, so put leash[1] into stdin to make it survive
dup2(leash[1], STDIN_FILENO);

// override stdout handle otherwise TTY detach doesnt work while sudo client runs
// Avoid exposing the interactive TTY through stdio to sudo.
int fd = open("/dev/null", O_RDWR);
if (fd != -1) {
dup2(fd, STDOUT_FILENO);
dup2(fd, STDERR_FILENO);
close(fd);
}

Expand Down
Loading