[BACK]Return to exec_pty.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / sudo / src

Diff for /embedaddon/sudo/src/exec_pty.c between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2012/10/09 09:29:52 version 1.1.1.4, 2013/07/22 10:46:13
Line 1 Line 1
 /*  /*
 * Copyright (c) 2009-2011 Todd C. Miller <Todd.Miller@courtesan.com> * Copyright (c) 2009-2013 Todd C. Miller <Todd.Miller@courtesan.com>
  *   *
  * Permission to use, copy, modify, and distribute this software for any   * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above   * purpose with or without fee is hereby granted, provided that the above
Line 17 Line 17
 #include <config.h>  #include <config.h>
   
 #include <sys/types.h>  #include <sys/types.h>
 #include <sys/param.h>  
 #ifdef HAVE_SYS_SYSMACROS_H  #ifdef HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h>  # include <sys/sysmacros.h>
 #endif  #endif
Line 86  struct io_buffer { Line 85  struct io_buffer {
     int rfd;  /* reader (producer) */      int rfd;  /* reader (producer) */
     int wfd; /* writer (consumer) */      int wfd; /* writer (consumer) */
     bool (*action)(const char *buf, unsigned int len);      bool (*action)(const char *buf, unsigned int len);
    char buf[16 * 1024];    char buf[32 * 1024];
 };  };
   
 static char slavename[PATH_MAX];  static char slavename[PATH_MAX];
 static bool foreground, pipeline, tty_initialized;  static bool foreground, pipeline, tty_initialized;
 static int io_fds[6] = { -1, -1, -1, -1, -1, -1};  static int io_fds[6] = { -1, -1, -1, -1, -1, -1};
 static int ttymode = TERM_COOKED;  static int ttymode = TERM_COOKED;
static pid_t ppgrp, cmnd_pgrp;static pid_t ppgrp, cmnd_pgrp, mon_pgrp;
 static sigset_t ttyblock;  static sigset_t ttyblock;
 static struct io_buffer *iobufs;  static struct io_buffer *iobufs;
   
 static void flush_output(void);  static void flush_output(void);
 static int exec_monitor(struct command_details *details, int backchannel);  static int exec_monitor(struct command_details *details, int backchannel);
static void exec_pty(struct command_details *detail, int *errfd);static void exec_pty(struct command_details *details,
     struct command_status *cstat, int *errfd);
 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, bool from_parent);  static void deliver_signal(pid_t pid, int signo, bool from_parent);
Line 107  static int safe_close(int fd); Line 107  static int safe_close(int fd);
 static void check_foreground(void);  static void check_foreground(void);
   
 /*  /*
 * Cleanup hook for error()/errorx() * Cleanup hook for fatal()/fatalx()
  */   */
voidstatic void
cleanup(int gotsignal)pty_cleanup(void)
 {  {
     debug_decl(cleanup, SUDO_DEBUG_EXEC);      debug_decl(cleanup, SUDO_DEBUG_EXEC);
   
Line 180  pty_setup(uid_t uid, const char *tty, const char *utmp Line 180  pty_setup(uid_t uid, const char *tty, const char *utmp
     if (io_fds[SFD_USERTTY] != -1) {      if (io_fds[SFD_USERTTY] != -1) {
         if (!get_pty(&io_fds[SFD_MASTER], &io_fds[SFD_SLAVE],          if (!get_pty(&io_fds[SFD_MASTER], &io_fds[SFD_SLAVE],
             slavename, sizeof(slavename), uid))              slavename, sizeof(slavename), uid))
            error(1, _("unable to allocate pty"));            fatal(_("unable to allocate pty"));
         /* Add entry to utmp/utmpx? */          /* Add entry to utmp/utmpx? */
         if (utmp_user != NULL)          if (utmp_user != NULL)
             utmp_login(tty, slavename, io_fds[SFD_SLAVE], utmp_user);              utmp_login(tty, slavename, io_fds[SFD_SLAVE], utmp_user);
Line 337  suspend_parent(int signo) Line 337  suspend_parent(int signo)
 {  {
     char signame[SIG2STR_MAX];      char signame[SIG2STR_MAX];
     sigaction_t sa, osa;      sigaction_t sa, osa;
    int n, oldmode = ttymode, rval = 0;    int n, rval = 0;
     debug_decl(suspend_parent, SUDO_DEBUG_EXEC);      debug_decl(suspend_parent, SUDO_DEBUG_EXEC);
   
     switch (signo) {      switch (signo) {
     case SIGTTOU:      case SIGTTOU:
     case SIGTTIN:      case SIGTTIN:
         /*          /*
         * If we are the foreground process, just resume the command.         * If sudo is already the foreground process, just resume the command
         * Otherwise, re-send the signal with the handler disabled.         * in the foreground.  If not, we'll suspend sudo and resume later.
          */           */
         if (!foreground)          if (!foreground)
             check_foreground();              check_foreground();
Line 359  suspend_parent(int signo) Line 359  suspend_parent(int signo)
             rval = SIGCONT_FG; /* resume command in foreground */              rval = SIGCONT_FG; /* resume command in foreground */
             break;              break;
         }          }
         ttymode = TERM_RAW;  
         /* FALLTHROUGH */          /* FALLTHROUGH */
     case SIGSTOP:      case SIGSTOP:
     case SIGTSTP:      case SIGTSTP:
Line 367  suspend_parent(int signo) Line 366  suspend_parent(int signo)
         flush_output();          flush_output();
   
         /* Restore original tty mode before suspending. */          /* Restore original tty mode before suspending. */
        if (oldmode != TERM_COOKED) {        if (ttymode != TERM_COOKED) {
             do {              do {
                 n = term_restore(io_fds[SFD_USERTTY], 0);                  n = term_restore(io_fds[SFD_USERTTY], 0);
             } while (!n && errno == EINTR);              } while (!n && errno == EINTR);
Line 377  suspend_parent(int signo) Line 376  suspend_parent(int signo)
             snprintf(signame, sizeof(signame), "%d", signo);              snprintf(signame, sizeof(signame), "%d", signo);
   
         /* Suspend self and continue command when we resume. */          /* Suspend self and continue command when we resume. */
        zero_bytes(&sa, sizeof(sa));        if (signo != SIGSTOP) {
        sigemptyset(&sa.sa_mask);            memset(&sa, 0, sizeof(sa));
        sa.sa_flags = SA_INTERRUPT; /* do not restart syscalls */            sigemptyset(&sa.sa_mask);
        sa.sa_handler = SIG_DFL;            sa.sa_flags = SA_RESTART;
        sigaction(signo, &sa, &osa);            sa.sa_handler = SIG_DFL;
             sudo_sigaction(signo, &sa, &osa);
         }
         sudo_debug_printf(SUDO_DEBUG_INFO, "kill parent SIG%s", signame);          sudo_debug_printf(SUDO_DEBUG_INFO, "kill parent SIG%s", signame);
         if (killpg(ppgrp, signo) != 0)          if (killpg(ppgrp, signo) != 0)
             warning("killpg(%d, SIG%s)", (int)ppgrp, signame);              warning("killpg(%d, SIG%s)", (int)ppgrp, signame);
Line 390  suspend_parent(int signo) Line 391  suspend_parent(int signo)
         check_foreground();          check_foreground();
   
         /*          /*
         * Only modify term if we are foreground process and either         * We always resume the command in the foreground if sudo itself
         * the old tty mode was not cooked or command got SIGTT{IN,OU}         * is the foreground process.  This helps work around poorly behaved
          * programs that catch SIGTTOU/SIGTTIN but suspend themselves with
          * SIGSTOP.  At worst, sudo will go into the background but upon
          * resume the command will be runnable.  Otherwise, we can get into
          * a situation where the command will immediately suspend itself.
          */           */
         sudo_debug_printf(SUDO_DEBUG_INFO, "parent is in %s, ttymode %d -> %d",          sudo_debug_printf(SUDO_DEBUG_INFO, "parent is in %s, ttymode %d -> %d",
            foreground ? "foreground" : "background", oldmode, ttymode);            foreground ? "foreground" : "background", ttymode,
             foreground ? TERM_RAW : TERM_COOKED);
   
        if (ttymode != TERM_COOKED) {        if (foreground) {
            if (foreground) {            /* Foreground process, set tty to raw mode. */
                /* Set raw mode. */            do {
                do {                n = term_raw(io_fds[SFD_USERTTY], 0);
                    n = term_raw(io_fds[SFD_USERTTY], 0);            } while (!n && errno == EINTR);
                } while (!n && errno == EINTR);            ttymode = TERM_RAW;
            } else {        } else {
                /* Background process, no access to tty. */            /* Background process, no access to tty. */
                ttymode = TERM_COOKED;            ttymode = TERM_COOKED;
            } 
         }          }
   
        sigaction(signo, &osa, NULL);        if (signo != SIGSTOP)
             sudo_sigaction(signo, &osa, NULL);
         rval = ttymode == TERM_RAW ? SIGCONT_FG : SIGCONT_BG;          rval = ttymode == TERM_RAW ? SIGCONT_FG : SIGCONT_BG;
         break;          break;
     }      }
Line 561  fork_pty(struct command_details *details, int sv[], in Line 567  fork_pty(struct command_details *details, int sv[], in
     sigset_t mask;      sigset_t mask;
     pid_t child;      pid_t child;
     debug_decl(fork_pty, SUDO_DEBUG_EXEC);      debug_decl(fork_pty, SUDO_DEBUG_EXEC);
        
     ppgrp = getpgrp(); /* parent's pgrp, so child can signal us */      ppgrp = getpgrp(); /* parent's pgrp, so child can signal us */
     
    zero_bytes(&sa, sizeof(sa));    memset(&sa, 0, sizeof(sa));
     sigemptyset(&sa.sa_mask);      sigemptyset(&sa.sa_mask);
 
     if (io_fds[SFD_USERTTY] != -1) {      if (io_fds[SFD_USERTTY] != -1) {
         sa.sa_flags = SA_RESTART;          sa.sa_flags = SA_RESTART;
         sa.sa_handler = sigwinch;          sa.sa_handler = sigwinch;
        sigaction(SIGWINCH, &sa, NULL);        sudo_sigaction(SIGWINCH, &sa, NULL);
     }      }
   
     /* So we can block tty-generated signals */      /* So we can block tty-generated signals */
Line 614  fork_pty(struct command_details *details, int sv[], in Line 620  fork_pty(struct command_details *details, int sv[], in
         sudo_debug_printf(SUDO_DEBUG_INFO, "stdin not a tty, creating a pipe");          sudo_debug_printf(SUDO_DEBUG_INFO, "stdin not a tty, creating a pipe");
         pipeline = true;          pipeline = true;
         if (pipe(io_pipe[STDIN_FILENO]) != 0)          if (pipe(io_pipe[STDIN_FILENO]) != 0)
            error(1, _("unable to create pipe"));            fatal(_("unable to create pipe"));
         iobufs = io_buf_new(STDIN_FILENO, io_pipe[STDIN_FILENO][1],          iobufs = io_buf_new(STDIN_FILENO, io_pipe[STDIN_FILENO][1],
             log_stdin, iobufs);              log_stdin, iobufs);
         io_fds[SFD_STDIN] = io_pipe[STDIN_FILENO][0];          io_fds[SFD_STDIN] = io_pipe[STDIN_FILENO][0];
Line 623  fork_pty(struct command_details *details, int sv[], in Line 629  fork_pty(struct command_details *details, int sv[], in
         sudo_debug_printf(SUDO_DEBUG_INFO, "stdout not a tty, creating a pipe");          sudo_debug_printf(SUDO_DEBUG_INFO, "stdout not a tty, creating a pipe");
         pipeline = true;          pipeline = true;
         if (pipe(io_pipe[STDOUT_FILENO]) != 0)          if (pipe(io_pipe[STDOUT_FILENO]) != 0)
            error(1, _("unable to create pipe"));            fatal(_("unable to create pipe"));
         iobufs = io_buf_new(io_pipe[STDOUT_FILENO][0], STDOUT_FILENO,          iobufs = io_buf_new(io_pipe[STDOUT_FILENO][0], STDOUT_FILENO,
             log_stdout, iobufs);              log_stdout, iobufs);
         io_fds[SFD_STDOUT] = io_pipe[STDOUT_FILENO][1];          io_fds[SFD_STDOUT] = io_pipe[STDOUT_FILENO][1];
Line 631  fork_pty(struct command_details *details, int sv[], in Line 637  fork_pty(struct command_details *details, int sv[], in
     if (io_fds[SFD_STDERR] == -1 || !isatty(STDERR_FILENO)) {      if (io_fds[SFD_STDERR] == -1 || !isatty(STDERR_FILENO)) {
         sudo_debug_printf(SUDO_DEBUG_INFO, "stderr not a tty, creating a pipe");          sudo_debug_printf(SUDO_DEBUG_INFO, "stderr not a tty, creating a pipe");
         if (pipe(io_pipe[STDERR_FILENO]) != 0)          if (pipe(io_pipe[STDERR_FILENO]) != 0)
            error(1, _("unable to create pipe"));            fatal(_("unable to create pipe"));
         iobufs = io_buf_new(io_pipe[STDERR_FILENO][0], STDERR_FILENO,          iobufs = io_buf_new(io_pipe[STDERR_FILENO][0], STDERR_FILENO,
             log_stderr, iobufs);              log_stderr, iobufs);
         io_fds[SFD_STDERR] = io_pipe[STDERR_FILENO][1];          io_fds[SFD_STDERR] = io_pipe[STDERR_FILENO][1];
     }      }
   
       /* We don't want to receive SIGTTIN/SIGTTOU, getting EIO is preferable. */
       sa.sa_handler = SIG_IGN;
       sudo_sigaction(SIGTTIN, &sa, NULL);
       sudo_sigaction(SIGTTOU, &sa, NULL);
   
     /* Job control signals to relay from parent to child. */      /* Job control signals to relay from parent to child. */
       sigfillset(&sa.sa_mask);
     sa.sa_flags = SA_INTERRUPT; /* do not restart syscalls */      sa.sa_flags = SA_INTERRUPT; /* do not restart syscalls */
 #ifdef SA_SIGINFO  #ifdef SA_SIGINFO
     sa.sa_flags |= SA_SIGINFO;      sa.sa_flags |= SA_SIGINFO;
Line 645  fork_pty(struct command_details *details, int sv[], in Line 657  fork_pty(struct command_details *details, int sv[], in
 #else  #else
     sa.sa_handler = handler;      sa.sa_handler = handler;
 #endif  #endif
    sigaction(SIGTSTP, &sa, NULL);    sudo_sigaction(SIGTSTP, &sa, NULL);
   
     /* We don't want to receive SIGTTIN/SIGTTOU, getting EIO is preferable. */  
     sa.sa_handler = SIG_IGN;  
     sigaction(SIGTTIN, &sa, NULL);  
     sigaction(SIGTTOU, &sa, NULL);  
   
     if (foreground) {      if (foreground) {
         /* Copy terminal attrs from user tty -> pty slave. */          /* Copy terminal attrs from user tty -> pty slave. */
         if (term_copy(io_fds[SFD_USERTTY], io_fds[SFD_SLAVE])) {          if (term_copy(io_fds[SFD_USERTTY], io_fds[SFD_SLAVE])) {
Line 659  fork_pty(struct command_details *details, int sv[], in Line 666  fork_pty(struct command_details *details, int sv[], in
             sync_ttysize(io_fds[SFD_USERTTY], io_fds[SFD_SLAVE]);              sync_ttysize(io_fds[SFD_USERTTY], io_fds[SFD_SLAVE]);
         }          }
   
        /* Start out in raw mode if we are not part of a pipeline. */        /* Start out in raw mode unless part of a pipeline or backgrounded. */
        if (!pipeline) {        if (!pipeline && !ISSET(details->flags, CD_EXEC_BG)) {
             ttymode = TERM_RAW;              ttymode = TERM_RAW;
             do {              do {
                 n = term_raw(io_fds[SFD_USERTTY], 0);                  n = term_raw(io_fds[SFD_USERTTY], 0);
             } while (!n && errno == EINTR);              } while (!n && errno == EINTR);
             if (!n)              if (!n)
                error(1, _("unable to set terminal to raw mode"));                fatal(_("unable to set terminal to raw mode"));
         }          }
     }      }
   
Line 675  fork_pty(struct command_details *details, int sv[], in Line 682  fork_pty(struct command_details *details, int sv[], in
      * or certain pam modules won't be able to track their state.       * or certain pam modules won't be able to track their state.
      */       */
     if (policy_init_session(details) != true)      if (policy_init_session(details) != true)
        errorx(1, _("policy plugin failed session initialization"));        fatalx(_("policy plugin failed session initialization"));
   
     /*      /*
      * Block some signals until cmnd_pid is set in the parent to avoid a       * Block some signals until cmnd_pid is set in the parent to avoid a
Line 691  fork_pty(struct command_details *details, int sv[], in Line 698  fork_pty(struct command_details *details, int sv[], in
     child = sudo_debug_fork();      child = sudo_debug_fork();
     switch (child) {      switch (child) {
     case -1:      case -1:
        error(1, _("unable to fork"));        fatal(_("unable to fork"));
         break;          break;
     case 0:      case 0:
         /* child */          /* child */
Line 700  fork_pty(struct command_details *details, int sv[], in Line 707  fork_pty(struct command_details *details, int sv[], in
         close(signal_pipe[1]);          close(signal_pipe[1]);
         fcntl(sv[1], F_SETFD, FD_CLOEXEC);          fcntl(sv[1], F_SETFD, FD_CLOEXEC);
         sigprocmask(SIG_SETMASK, omask, NULL);          sigprocmask(SIG_SETMASK, omask, NULL);
        if (exec_setup(details, slavename, io_fds[SFD_SLAVE]) == true) {        /* Close the other end of the stdin/stdout/stderr pipes and exec. */
            /* Close the other end of the stdin/stdout/stderr pipes and exec. */        if (io_pipe[STDIN_FILENO][1])
            if (io_pipe[STDIN_FILENO][1])            close(io_pipe[STDIN_FILENO][1]);
                close(io_pipe[STDIN_FILENO][1]);        if (io_pipe[STDOUT_FILENO][0])
            if (io_pipe[STDOUT_FILENO][0])            close(io_pipe[STDOUT_FILENO][0]);
                close(io_pipe[STDOUT_FILENO][0]);        if (io_pipe[STDERR_FILENO][0])
            if (io_pipe[STDERR_FILENO][0])            close(io_pipe[STDERR_FILENO][0]);
                close(io_pipe[STDERR_FILENO][0]);        exec_monitor(details, sv[1]);
            exec_monitor(details, sv[1]); 
        } 
         cstat.type = CMD_ERRNO;          cstat.type = CMD_ERRNO;
         cstat.val = errno;          cstat.val = errno;
         ignore_result(send(sv[1], &cstat, sizeof(cstat), 0));          ignore_result(send(sv[1], &cstat, sizeof(cstat), 0));
Line 721  fork_pty(struct command_details *details, int sv[], in Line 726  fork_pty(struct command_details *details, int sv[], in
         close(io_pipe[STDIN_FILENO][0]);          close(io_pipe[STDIN_FILENO][0]);
     if (io_pipe[STDOUT_FILENO][1])      if (io_pipe[STDOUT_FILENO][1])
         close(io_pipe[STDOUT_FILENO][1]);          close(io_pipe[STDOUT_FILENO][1]);
    if (io_pipe[STDERR_FILENO][1])     if (io_pipe[STDERR_FILENO][1])
         close(io_pipe[STDERR_FILENO][1]);          close(io_pipe[STDERR_FILENO][1]);
   
     for (iob = iobufs; iob; iob = iob->next) {      for (iob = iobufs; iob; iob = iob->next) {
Line 830  deliver_signal(pid_t pid, int signo, bool from_parent) Line 835  deliver_signal(pid_t pid, int signo, bool from_parent)
     int status;      int status;
     debug_decl(deliver_signal, SUDO_DEBUG_EXEC);      debug_decl(deliver_signal, SUDO_DEBUG_EXEC);
   
    if (sig2str(signo, signame) == -1)    if (signo == SIGCONT_FG)
         strlcpy(signame, "CONT_FG", sizeof(signame));
     else if (signo == SIGCONT_BG)
         strlcpy(signame, "CONT_BG", sizeof(signame));
     else if (sig2str(signo, signame) == -1)
         snprintf(signame, sizeof(signame), "%d", signo);          snprintf(signame, sizeof(signame), "%d", signo);
   
     /* Handle signal from parent. */      /* Handle signal from parent. */
Line 850  deliver_signal(pid_t pid, int signo, bool from_parent) Line 859  deliver_signal(pid_t pid, int signo, bool from_parent)
     case SIGCONT_BG:      case SIGCONT_BG:
         /* Continue in background, I take controlling tty. */          /* Continue in background, I take controlling tty. */
         do {          do {
            status = tcsetpgrp(io_fds[SFD_SLAVE], getpid());            status = tcsetpgrp(io_fds[SFD_SLAVE], mon_pgrp);
         } while (status == -1 && errno == EINTR);          } while (status == -1 && errno == EINTR);
         killpg(pid, SIGCONT);          killpg(pid, SIGCONT);
         break;          break;
Line 920  handle_sigchld(int backchannel, struct command_status  Line 929  handle_sigchld(int backchannel, struct command_status 
                     snprintf(signame, sizeof(signame), "%d", WSTOPSIG(status));                      snprintf(signame, sizeof(signame), "%d", WSTOPSIG(status));
                 sudo_debug_printf(SUDO_DEBUG_INFO,                  sudo_debug_printf(SUDO_DEBUG_INFO,
                     "command stopped, SIG%s", signame);                      "command stopped, SIG%s", signame);
                   /* Saved the foreground pgid so we can restore it later. */
                 do {                  do {
                    cmnd_pgrp = tcgetpgrp(io_fds[SFD_SLAVE]);                    pid = tcgetpgrp(io_fds[SFD_SLAVE]);
                } while (cmnd_pgrp == -1 && errno == EINTR);                } while (pid == -1 && errno == EINTR);
                 if (pid != mon_pgrp)
                     cmnd_pgrp = pid;
                 if (send_status(backchannel, cstat) == -1)                  if (send_status(backchannel, cstat) == -1)
                     return alive; /* XXX */                      return alive; /* XXX */
             } else if (WIFSIGNALED(status)) {              } else if (WIFSIGNALED(status)) {
Line 955  exec_monitor(struct command_details *details, int back Line 967  exec_monitor(struct command_details *details, int back
     struct timeval tv;      struct timeval tv;
     fd_set *fdsr;      fd_set *fdsr;
     sigaction_t sa;      sigaction_t sa;
    int errpipe[2], maxfd, n, status;    int errpipe[2], maxfd, n;
     bool alive = true;      bool alive = true;
     unsigned char signo;      unsigned char signo;
     debug_decl(exec_monitor, SUDO_DEBUG_EXEC);      debug_decl(exec_monitor, SUDO_DEBUG_EXEC);
Line 971  exec_monitor(struct command_details *details, int back Line 983  exec_monitor(struct command_details *details, int back
      * the select() loop.       * the select() loop.
      */       */
     if (pipe_nonblock(signal_pipe) != 0)      if (pipe_nonblock(signal_pipe) != 0)
        error(1, _("unable to create pipe"));        fatal(_("unable to create pipe"));
   
     /* Reset SIGWINCH and SIGALRM. */      /* Reset SIGWINCH and SIGALRM. */
    zero_bytes(&sa, sizeof(sa));    memset(&sa, 0, sizeof(sa));
     sigemptyset(&sa.sa_mask);      sigemptyset(&sa.sa_mask);
     sa.sa_flags = SA_RESTART;      sa.sa_flags = SA_RESTART;
     sa.sa_handler = SIG_DFL;      sa.sa_handler = SIG_DFL;
    sigaction(SIGWINCH, &sa, NULL);    sudo_sigaction(SIGWINCH, &sa, NULL);
    sigaction(SIGALRM, &sa, NULL);    sudo_sigaction(SIGALRM, &sa, NULL);
   
     /* Ignore any SIGTTIN or SIGTTOU we get. */      /* Ignore any SIGTTIN or SIGTTOU we get. */
     sa.sa_handler = SIG_IGN;      sa.sa_handler = SIG_IGN;
    sigaction(SIGTTIN, &sa, NULL);    sudo_sigaction(SIGTTIN, &sa, NULL);
    sigaction(SIGTTOU, &sa, NULL);    sudo_sigaction(SIGTTOU, &sa, NULL);
   
       /* Block all signals in mon_handler(). */
       sigfillset(&sa.sa_mask);
   
     /* Note: HP-UX select() will not be interrupted if SA_RESTART set */      /* Note: HP-UX select() will not be interrupted if SA_RESTART set */
     sa.sa_flags = SA_INTERRUPT;      sa.sa_flags = SA_INTERRUPT;
 #ifdef SA_SIGINFO  #ifdef SA_SIGINFO
Line 994  exec_monitor(struct command_details *details, int back Line 1009  exec_monitor(struct command_details *details, int back
 #else  #else
     sa.sa_handler = mon_handler;      sa.sa_handler = mon_handler;
 #endif  #endif
    sigaction(SIGCHLD, &sa, NULL);    sudo_sigaction(SIGCHLD, &sa, NULL);
   
     /* Catch common signals so we can cleanup properly. */      /* Catch common signals so we can cleanup properly. */
     sa.sa_flags = SA_RESTART;      sa.sa_flags = SA_RESTART;
Line 1004  exec_monitor(struct command_details *details, int back Line 1019  exec_monitor(struct command_details *details, int back
 #else  #else
     sa.sa_handler = mon_handler;      sa.sa_handler = mon_handler;
 #endif  #endif
    sigaction(SIGHUP, &sa, NULL);    sudo_sigaction(SIGHUP, &sa, NULL);
    sigaction(SIGINT, &sa, NULL);    sudo_sigaction(SIGINT, &sa, NULL);
    sigaction(SIGQUIT, &sa, NULL);    sudo_sigaction(SIGQUIT, &sa, NULL);
    sigaction(SIGTERM, &sa, NULL);    sudo_sigaction(SIGTERM, &sa, NULL);
    sigaction(SIGTSTP, &sa, NULL);    sudo_sigaction(SIGTSTP, &sa, NULL);
    sigaction(SIGUSR1, &sa, NULL);    sudo_sigaction(SIGUSR1, &sa, NULL);
    sigaction(SIGUSR2, &sa, NULL);    sudo_sigaction(SIGUSR2, &sa, NULL);
   
     /*      /*
      * Start a new session with the parent as the session leader       * Start a new session with the parent as the session leader
Line 1024  exec_monitor(struct command_details *details, int back Line 1039  exec_monitor(struct command_details *details, int back
     if (io_fds[SFD_SLAVE] != -1) {      if (io_fds[SFD_SLAVE] != -1) {
 #ifdef TIOCSCTTY  #ifdef TIOCSCTTY
         if (ioctl(io_fds[SFD_SLAVE], TIOCSCTTY, NULL) != 0)          if (ioctl(io_fds[SFD_SLAVE], TIOCSCTTY, NULL) != 0)
            error(1, _("unable to set controlling tty"));            fatal(_("unable to set controlling tty"));
 #else  #else
         /* Set controlling tty by reopening slave. */          /* Set controlling tty by reopening slave. */
         if ((n = open(slavename, O_RDWR)) >= 0)          if ((n = open(slavename, O_RDWR)) >= 0)
Line 1032  exec_monitor(struct command_details *details, int back Line 1047  exec_monitor(struct command_details *details, int back
 #endif  #endif
     }      }
   
       mon_pgrp = getpgrp();       /* save a copy of our process group */
   
     /*      /*
      * If stdin/stdout is not a tty, start command in the background       * If stdin/stdout is not a tty, start command in the background
      * since it might be part of a pipeline that reads from /dev/tty.       * since it might be part of a pipeline that reads from /dev/tty.
Line 1043  exec_monitor(struct command_details *details, int back Line 1060  exec_monitor(struct command_details *details, int back
   
     /* Start command and wait for it to stop or exit */      /* Start command and wait for it to stop or exit */
     if (pipe(errpipe) == -1)      if (pipe(errpipe) == -1)
        error(1, _("unable to create pipe"));        fatal(_("unable to create pipe"));
     cmnd_pid = sudo_debug_fork();      cmnd_pid = sudo_debug_fork();
     if (cmnd_pid == -1) {      if (cmnd_pid == -1) {
         warning(_("unable to fork"));          warning(_("unable to fork"));
Line 1059  exec_monitor(struct command_details *details, int back Line 1076  exec_monitor(struct command_details *details, int back
         restore_signals();          restore_signals();
   
         /* setup tty and exec command */          /* setup tty and exec command */
        exec_pty(details, &errpipe[1]);        exec_pty(details, &cstat, &errpipe[1]);
        cstat.type = CMD_ERRNO; 
        cstat.val = errno; 
         ignore_result(write(errpipe[1], &cstat, sizeof(cstat)));          ignore_result(write(errpipe[1], &cstat, sizeof(cstat)));
         _exit(1);          _exit(1);
     }      }
Line 1080  exec_monitor(struct command_details *details, int back Line 1095  exec_monitor(struct command_details *details, int back
     if (io_fds[SFD_STDERR] != io_fds[SFD_SLAVE])      if (io_fds[SFD_STDERR] != io_fds[SFD_SLAVE])
         close(io_fds[SFD_STDERR]);          close(io_fds[SFD_STDERR]);
   
    /*    /* Put command in its own process group. */
     * Put command in its own process group.  If we are starting the command 
     * in the foreground, assign its pgrp to the tty. 
     */ 
     cmnd_pgrp = cmnd_pid;      cmnd_pgrp = cmnd_pid;
     setpgid(cmnd_pid, cmnd_pgrp);      setpgid(cmnd_pid, cmnd_pgrp);
    if (foreground) {
     /* Make the command the foreground process for the pty slave. */
     if (foreground && !ISSET(details->flags, CD_EXEC_BG)) {
         do {          do {
            status = tcsetpgrp(io_fds[SFD_SLAVE], cmnd_pgrp);            n = tcsetpgrp(io_fds[SFD_SLAVE], cmnd_pgrp);
        } while (status == -1 && errno == EINTR);        } while (n == -1 && errno == EINTR);
     }      }
   
     /* Wait for errno on pipe, signal on backchannel or for SIGCHLD */      /* Wait for errno on pipe, signal on backchannel or for SIGCHLD */
Line 1266  flush_output(void) Line 1280  flush_output(void)
  * Returns only if execve() fails.   * Returns only if execve() fails.
  */   */
 static void  static void
exec_pty(struct command_details *details, int *errfd)exec_pty(struct command_details *details,
     struct command_status *cstat, int *errfd)
 {  {
     pid_t self = getpid();      pid_t self = getpid();
     debug_decl(exec_pty, SUDO_DEBUG_EXEC);      debug_decl(exec_pty, SUDO_DEBUG_EXEC);
   
       /* Register cleanup function */
       fatal_callback_register(pty_cleanup);
   
     /* Set command process group here too to avoid a race. */      /* Set command process group here too to avoid a race. */
     setpgid(0, self);      setpgid(0, self);
   
Line 1278  exec_pty(struct command_details *details, int *errfd) Line 1296  exec_pty(struct command_details *details, int *errfd)
     if (dup2(io_fds[SFD_STDIN], STDIN_FILENO) == -1 ||      if (dup2(io_fds[SFD_STDIN], STDIN_FILENO) == -1 ||
         dup2(io_fds[SFD_STDOUT], STDOUT_FILENO) == -1 ||          dup2(io_fds[SFD_STDOUT], STDOUT_FILENO) == -1 ||
         dup2(io_fds[SFD_STDERR], STDERR_FILENO) == -1)          dup2(io_fds[SFD_STDERR], STDERR_FILENO) == -1)
        error(1, "dup2");        fatal("dup2");
   
     /* Wait for parent to grant us the tty if we are foreground. */      /* Wait for parent to grant us the tty if we are foreground. */
    if (foreground) {    if (foreground && !ISSET(details->flags, CD_EXEC_BG)) {
         while (tcgetpgrp(io_fds[SFD_SLAVE]) != self)          while (tcgetpgrp(io_fds[SFD_SLAVE]) != self)
             ; /* spin */              ; /* spin */
     }      }
Line 1296  exec_pty(struct command_details *details, int *errfd) Line 1314  exec_pty(struct command_details *details, int *errfd)
     if (io_fds[SFD_STDERR] != io_fds[SFD_SLAVE])      if (io_fds[SFD_STDERR] != io_fds[SFD_SLAVE])
         close(io_fds[SFD_STDERR]);          close(io_fds[SFD_STDERR]);
   
    sudo_debug_execve(SUDO_DEBUG_INFO, details->command,    /* Execute command; only returns on error. */
        details->argv, details->envp);    exec_cmnd(details, cstat, errfd);
   
     if (details->closefrom >= 0) {  
         int maxfd = details->closefrom;  
         dup2(*errfd, maxfd);  
         (void)fcntl(maxfd, F_SETFD, FD_CLOEXEC);  
         *errfd = maxfd++;  
         if (sudo_debug_fd_set(maxfd) != -1)  
             maxfd++;  
         closefrom(maxfd);  
     }  
 #ifdef HAVE_SELINUX  
     if (ISSET(details->flags, CD_RBAC_ENABLED)) {  
         selinux_execve(details->command, details->argv, details->envp,  
             ISSET(details->flags, CD_NOEXEC));  
     } else  
 #endif  
     {  
         sudo_execve(details->command, details->argv, details->envp,  
             ISSET(details->flags, CD_NOEXEC));  
     }  
     sudo_debug_printf(SUDO_DEBUG_ERROR, "unable to exec %s: %s",  
         details->command, strerror(errno));  
     debug_return;      debug_return;
 }  }
   
Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>