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

Avoid closing stdin/stdout/stderr when we are piping output.

Browse Source
This commit is contained in:
Todd C. Miller
2010-05-20 17:01:27 -04:00
parent f8ff268318
commit 882fe3ac41
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/script.c
View File

@@ -130,6 +130,7 @@ static void script_run(const char *path, char *argv[], char *envp[], int);
static void sigwinch(int s); static void sigwinch(int s);
static void sync_ttysize(int src, int dst); static void sync_ttysize(int src, int dst);
static void deliver_signal(pid_t pid, int signo); static void deliver_signal(pid_t pid, int signo);
static int safe_close(int fd);
/* sudo.c */ /* sudo.c */
extern struct plugin_container_list io_plugins; extern struct plugin_container_list io_plugins;
@@ -433,8 +434,7 @@ perform_io(struct io_buffer *iobufs, fd_set *fdsr, fd_set *fdsw)
break; break;
} else if (n == 0) { } else if (n == 0) {
/* got EOF */ /* got EOF */
if (iob->rfd != script_fds[SFD_USERTTY]) safe_close(iob->rfd);
close(iob->rfd);
iob->rfd = -1; iob->rfd = -1;
} else { } else {
if (!iob->action(iob->buf + iob->len, n)) if (!iob->action(iob->buf + iob->len, n))
@@ -451,12 +451,10 @@ perform_io(struct io_buffer *iobufs, fd_set *fdsr, fd_set *fdsw)
if (errno == EPIPE) { if (errno == EPIPE) {
/* other end of pipe closed */ /* other end of pipe closed */
if (iob->rfd != -1) { if (iob->rfd != -1) {
if (iob->rfd != script_fds[SFD_USERTTY]) safe_close(iob->rfd);
close(iob->rfd);
iob->rfd = -1; iob->rfd = -1;
} }
if (iob->wfd != script_fds[SFD_USERTTY]) safe_close(iob->wfd);
close(iob->wfd);
iob->wfd = -1; iob->wfd = -1;
continue; continue;
} }
@@ -741,8 +739,7 @@ script_execve(struct command_details *details, char *argv[], char *envp[],
iob->off = iob->len = 0; iob->off = iob->len = 0;
/* Forward the EOF from reader to writer. */ /* Forward the EOF from reader to writer. */
if (iob->rfd == -1) { if (iob->rfd == -1) {
if (iob->wfd != script_fds[SFD_USERTTY]) safe_close(iob->wfd);
close(iob->wfd);
iob->wfd = -1; iob->wfd = -1;
} }
} }
@@ -1220,8 +1217,7 @@ flush_output(struct io_buffer *iobufs)
iob->off = iob->len = 0; iob->off = iob->len = 0;
/* Forward the EOF from reader to writer. */ /* Forward the EOF from reader to writer. */
if (iob->rfd == -1) { if (iob->rfd == -1) {
if (iob->wfd != script_fds[SFD_USERTTY]) safe_close(iob->wfd);
close(iob->wfd);
iob->wfd = -1; iob->wfd = -1;
} }
} }
@@ -1323,3 +1319,14 @@ sigwinch(int s)
sync_ttysize(script_fds[SFD_USERTTY], script_fds[SFD_SLAVE]); sync_ttysize(script_fds[SFD_USERTTY], script_fds[SFD_SLAVE]);
errno = serrno; errno = serrno;
} }
/*
* Only close the fd if it is not /dev/tty or std{in,out,err}
*/
static int
safe_close(int fd)
{
if (fd < 3 || fd == script_fds[SFD_USERTTY])
return -1;
return close(fd);
}