security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-11 22:01:08 +02:00
Code Activity

Fix signal handling race condition.

Browse Source
This commit is contained in:
Werner Koch 2008-12-17 19:42:17 +00:00
parent 53f1c11adf
commit 6a09ba60cc
2 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/ChangeLog
View File

@ -1,3 +1,8 @@
2008-12-17 Werner Koch <wk@g10code.com>
* gpg-agent.c (handle_connections): Set action of all pth event
handled signals to SIG_IGN. Use a different pth_sigmask strategy.
2008-12-10 Werner Koch <wk@g10code.com> 2008-12-10 Werner Koch <wk@g10code.com>
* command.c (cmd_get_passphrase): Implement option --no-ask. * command.c (cmd_get_passphrase): Implement option --no-ask.

41
agent/gpg-agent.c
View File

@ -1748,13 +1748,28 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
#ifndef HAVE_W32_SYSTEM /* fixme */ #ifndef HAVE_W32_SYSTEM /* fixme */
/* Make sure that the signals we are going to handle are not blocked /* Make sure that the signals we are going to handle are not blocked
and create an event object for them. */ and create an event object for them. We also set the default
action to ignore because we use an Pth event to get notified
about signals. This avoids that the default action is taken in
case soemthing goes wrong within Pth. The problem might also be
a Pth bug. */
sigemptyset (&sigs ); sigemptyset (&sigs );
sigaddset (&sigs, SIGHUP); {
sigaddset (&sigs, SIGUSR1); static const int mysigs[] = { SIGHUP, SIGUSR1, SIGUSR2, SIGINT, SIGTERM };
sigaddset (&sigs, SIGUSR2); struct sigaction sa;
sigaddset (&sigs, SIGINT); int i;
sigaddset (&sigs, SIGTERM);
for (i=0; i < DIM (mysigs); i++)
{
sigemptyset (&sa.sa_mask);
sa.sa_handler = SIG_IGN;
sa.sa_flags = 0;
sigaction (mysigs[i], &sa, NULL);
sigaddset (&sigs, mysigs[i]);
}
}
pth_sigmask (SIG_UNBLOCK, &sigs, NULL); pth_sigmask (SIG_UNBLOCK, &sigs, NULL);
ev = pth_event (PTH_EVENT_SIGS, &sigs, &signo); ev = pth_event (PTH_EVENT_SIGS, &sigs, &signo);
#else #else
@ -1782,8 +1797,10 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
for (;;) for (;;)
{ {
sigset_t oldsigs; /* Make sure that our signals are not blocked. */
pth_sigmask (SIG_UNBLOCK, &sigs, NULL);
/* Shutdown test. */
if (shutdown_pending) if (shutdown_pending)
{ {
if (pth_ctrl (PTH_CTRL_GETTHREADS) == 1) if (pth_ctrl (PTH_CTRL_GETTHREADS) == 1)
@ -1843,7 +1860,7 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
log_error (_("pth_select failed: %s - waiting 1s\n"), log_error (_("pth_select failed: %s - waiting 1s\n"),
strerror (errno)); strerror (errno));
pth_sleep (1); pth_sleep (1);
continue; continue;
} }
if (pth_event_occurred (ev)) if (pth_event_occurred (ev))
@ -1862,11 +1879,11 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
handle_tick (); handle_tick ();
} }
/* We now might create new threads and because we don't want any /* We now might create new threads and because we don't want any
signals (as we are handling them here) to be delivered to a signals (as we are handling them here) to be delivered to a
new thread. Thus we need to block those signals. */ new thread. Thus we need to block those signals. */
pth_sigmask (SIG_BLOCK, &sigs, &oldsigs); pth_sigmask (SIG_BLOCK, &sigs, NULL);
if (!shutdown_pending && FD_ISSET (FD2INT (listen_fd), &read_fdset)) if (!shutdown_pending && FD_ISSET (FD2INT (listen_fd), &read_fdset))
{ {
@ -1943,10 +1960,6 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
} }
fd = GNUPG_INVALID_FD; fd = GNUPG_INVALID_FD;
} }
/* Restore the signal mask. */
pth_sigmask (SIG_SETMASK, &oldsigs, NULL);
} }
pth_event_free (ev, PTH_FREE_ALL); pth_event_free (ev, PTH_FREE_ALL);