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

Use the standard idiom for popping all entries from a tail queue.

Browse Source 
The llvm checker gets confused by TAILQ_REMOVE and generate
use-after-free false positives.
This commit is contained in:
Todd C. Miller
2017-04-20 16:13:14 -06:00
parent c60259bd63
commit 9f1afe23fe
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/exec_pty.c
View File

@@ -1061,8 +1061,7 @@ sigfwd_cb(int sock, int what, void *v)
ssize_t nsent; ssize_t nsent;
debug_decl(sigfwd_cb, SUDO_DEBUG_EXEC) debug_decl(sigfwd_cb, SUDO_DEBUG_EXEC)
while (!TAILQ_EMPTY(&ec->sigfwd_list)) { while ((sigfwd = TAILQ_FIRST(&ec->sigfwd_list)) != NULL) {
sigfwd = TAILQ_FIRST(&ec->sigfwd_list);
if (sigfwd->signo == SIGCONT_FG) if (sigfwd->signo == SIGCONT_FG)
strlcpy(signame, "CONT_FG", sizeof(signame)); strlcpy(signame, "CONT_FG", sizeof(signame));
else if (sigfwd->signo == SIGCONT_BG) else if (sigfwd->signo == SIGCONT_BG)
@@ -1080,14 +1079,13 @@ sigfwd_cb(int sock, int what, void *v)
free(sigfwd); free(sigfwd);
if (nsent != sizeof(cstat)) { if (nsent != sizeof(cstat)) {
if (errno == EPIPE) { if (errno == EPIPE) {
struct sigforward *sigfwd_next;
sudo_debug_printf(SUDO_DEBUG_ERROR, sudo_debug_printf(SUDO_DEBUG_ERROR,
"broken pipe writing to child over backchannel"); "broken pipe writing to child over backchannel");
/* Other end of socket gone, empty out sigfwd_list. */ /* Other end of socket gone, empty out sigfwd_list. */
TAILQ_FOREACH_SAFE(sigfwd, &ec->sigfwd_list, entries, sigfwd_next) { while ((sigfwd = TAILQ_FIRST(&ec->sigfwd_list)) != NULL) {
TAILQ_REMOVE(&ec->sigfwd_list, sigfwd, entries);
free(sigfwd); free(sigfwd);
} }
TAILQ_INIT(&ec->sigfwd_list);
/* XXX - child (monitor) is dead, we should exit too? */ /* XXX - child (monitor) is dead, we should exit too? */
} }
break; break;