diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-01-23 08:10:22 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2020-01-23 08:51:25 +0100 |
| commit | 3bf2a6ac791d64046a537335a0f1d5e43579c5ad (patch) | |
| tree | 76fcc0f1be306541c074be4aed3aca66023f0962 /auth-pam.c | |
| parent | upstream: missing header change from previous; spotted by dtucker@ (diff) | |
| download | openssh-3bf2a6ac791d64046a537335a0f1d5e43579c5ad.tar.xz openssh-3bf2a6ac791d64046a537335a0f1d5e43579c5ad.zip | |
upstream: Replace all calls to signal(2) with a wrapper around
sigaction(2). This wrapper blocks all other signals during the handler
preventing races between handlers, and sets SA_RESTART which should reduce
the potential for short read/write operations.
OpenBSD-Commit-ID: 5e047663fd77a40d7b07bdabe68529df51fd2519
Diffstat (limited to 'auth-pam.c')
| -rw-r--r-- | auth-pam.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/auth-pam.c b/auth-pam.c index 856fdd40f..0cd2b0019 100644 --- a/auth-pam.c +++ b/auth-pam.c @@ -156,7 +156,7 @@ static mysig_t sshpam_oldsig; static void sshpam_sigchld_handler(int sig) { - signal(SIGCHLD, SIG_DFL); + ssh_signal(SIGCHLD, SIG_DFL); if (cleanup_ctxt == NULL) return; /* handler called after PAM cleanup, shouldn't happen */ if (waitpid(cleanup_ctxt->pam_thread, &sshpam_thread_status, WNOHANG) @@ -208,7 +208,7 @@ pthread_create(sp_pthread_t *thread, const void *attr, *thread = pid; close(ctx->pam_csock); ctx->pam_csock = -1; - sshpam_oldsig = signal(SIGCHLD, sshpam_sigchld_handler); + sshpam_oldsig = ssh_signal(SIGCHLD, sshpam_sigchld_handler); return (0); } } @@ -216,7 +216,7 @@ pthread_create(sp_pthread_t *thread, const void *attr, static int pthread_cancel(sp_pthread_t thread) { - signal(SIGCHLD, sshpam_oldsig); + ssh_signal(SIGCHLD, sshpam_oldsig); return (kill(thread, SIGTERM)); } @@ -228,7 +228,7 @@ pthread_join(sp_pthread_t thread, void **value) if (sshpam_thread_status != -1) return (sshpam_thread_status); - signal(SIGCHLD, sshpam_oldsig); + ssh_signal(SIGCHLD, sshpam_oldsig); while (waitpid(thread, &status, 0) == -1) { if (errno == EINTR) continue; |