isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If the process is already being traced, just resume it and clear flags.

Browse Source 
This makes it possible to run sudo in ptrace intercept mode from within
a shell (or other process) that is already being traced by sudo.
This commit is contained in:
Todd C. Miller
2022-05-03 13:34:40 -06:00
parent cc52ab770c
commit e84fdd99fd
4 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/exec_nopty.c
View File

@@ -476,18 +476,21 @@ exec_nopty(struct command_details *details, struct command_status *cstat)
fill_exec_closure_nopty(&ec, cstat, details, errpipe[0]);
if (ISSET(details->flags, CD_INTERCEPT|CD_LOG_SUBCMDS)) {
bool success = true;
int rc = 1;
/* Create event and closure for intercept mode. */
ec.intercept = intercept_setup(intercept_sv[0], ec.evbase, details);
if (ec.intercept == NULL) {
success = false;
rc = -1;
} else if (ISSET(details->flags, CD_USE_PTRACE)) {
/* Seize control of the command using ptrace(2). */
if (!exec_ptrace_seize(ec.cmnd_pid))
success = false;
/* Try to seize control of the command using ptrace(2). */
rc = exec_ptrace_seize(ec.cmnd_pid);
if (rc == 0) {
/* There is another tracer present. */
CLR(details->flags, CD_INTERCEPT|CD_LOG_SUBCMDS|CD_USE_PTRACE);
}
}
if (!success)
if (rc == -1)
terminate_command(ec.cmnd_pid, true);
}