aboutsummaryrefslogtreecommitdiff
path: root/gdb/common
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2016-08-09 20:16:20 +0100
committerPedro Alves <palves@redhat.com>2016-08-09 20:16:20 +0100
commitf348d89aeccaf3eb613e2f31a823baa64300bf88 (patch)
tree66f0119540539603832d1b3170848b1f9711b43a /gdb/common
parent7cfee229f1eb6e3ee98b63918a5189a330284751 (diff)
downloadgdb-f348d89aeccaf3eb613e2f31a823baa64300bf88.zip
gdb-f348d89aeccaf3eb613e2f31a823baa64300bf88.tar.gz
gdb-f348d89aeccaf3eb613e2f31a823baa64300bf88.tar.bz2
Fix PR gdb/18653: gdb disturbs inferior's inherited signal dispositions
gdb's (or gdbserver's) own signal handling should not interfere with the signal dispositions their spawned children inherit. However, it currently does. For example, some paths in gdb cause SIGPIPE to be set to SIG_IGN, and as consequence, the child starts with SIGPIPE to set to SIG_IGN too, even though gdb was started with SIGPIPE set to SIG_DFL. This is because the exec family of functions does not reset the signal disposition of signals that are set to SIG_IGN: http://pubs.opengroup.org/onlinepubs/7908799/xsh/execve.html Signals set to the default action (SIG_DFL) in the calling process image are set to the default action in the new process image. Signals set to be ignored (SIG_IGN) by the calling process image are set to be ignored by the new process image. Signals set to be caught by the calling process image are set to the default action in the new process image (see <signal.h>). And neither does it reset signal masks or flags. In order to be transparent, when spawning new child processes to debug (with "run", etc.), reset signal actions and mask back to what was originally inherited from gdb/gdbserver's parent, just before execing the target program to debug. gdb/ChangeLog: 2016-08-09 Pedro Alves <palves@redhat.com> PR gdb/18653 * Makefile.in (SFILES): Add common/signals-state-save-restore.c. (HFILES_NO_SRCDIR): Add common/signals-state-save-restore.h. (COMMON_OBS): Add signals-state-save-restore.o. (signals-state-save-restore.o): New rule. * configure: Regenerate. * fork-child.c: Include "signals-state-save-restore.h". (fork_inferior): Call restore_original_signals_state. * main.c: Include "signals-state-save-restore.h". (captured_main): Call save_original_signals_state. * common/common.m4: Add sigaction to AC_CHECK_FUNCS checks. * common/signals-state-save-restore.c: New file. * common/signals-state-save-restore.h: New file. gdb/gdbserver/ChangeLog: 2016-08-09 Pedro Alves <palves@redhat.com> PR gdb/18653 * Makefile.in (OBS): Add signals-state-save-restore.o. (signals-state-save-restore.o): New rule. * config.in: Regenerate. * configure: Regenerate. * linux-low.c: Include "signals-state-save-restore.h". (linux_create_inferior): Call restore_original_signals_state. * server.c: Include "dispositions-save-restore.h". (captured_main): Call save_original_signals_state. gdb/testsuite/ChangeLog: 2016-08-09 Pedro Alves <palves@redhat.com> PR gdb/18653 * gdb.base/signals-state-child.c: New file. * gdb.base/signals-state-child.exp: New file. * gdb.gdb/selftest.exp (do_steps_and_nexts): Add new pattern.
Diffstat (limited to 'gdb/common')
-rw-r--r--gdb/common/common.m42
-rw-r--r--gdb/common/signals-state-save-restore.c94
-rw-r--r--gdb/common/signals-state-save-restore.h39
3 files changed, 134 insertions, 1 deletions
diff --git a/gdb/common/common.m4 b/gdb/common/common.m4
index 1342503..68afc65 100644
--- a/gdb/common/common.m4
+++ b/gdb/common/common.m4
@@ -30,7 +30,7 @@ AC_DEFUN([GDB_AC_COMMON], [
sys/un.h sys/wait.h dnl
thread_db.h wait.h)
- AC_CHECK_FUNCS([fdwalk getrlimit pipe pipe2 socketpair])
+ AC_CHECK_FUNCS([fdwalk getrlimit pipe pipe2 socketpair sigaction])
AC_CHECK_DECLS([strerror, strstr])
diff --git a/gdb/common/signals-state-save-restore.c b/gdb/common/signals-state-save-restore.c
new file mode 100644
index 0000000..1c00cdd
--- /dev/null
+++ b/gdb/common/signals-state-save-restore.c
@@ -0,0 +1,94 @@
+/* Copyright (C) 2016 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "common-defs.h"
+#include "signals-state-save-restore.h"
+
+#include <signal.h>
+
+/* The original signal actions and mask. */
+
+#ifdef HAVE_SIGACTION
+static struct sigaction original_signal_actions[NSIG];
+
+/* Note that we use sigprocmask without worrying about threads because
+ the save/restore functions are called either from main, or after a
+ fork. In both cases, we know the calling process is single
+ threaded. */
+static sigset_t original_signal_mask;
+#endif
+
+/* See signals-state-save-restore.h. */
+
+void
+save_original_signals_state (void)
+{
+#ifdef HAVE_SIGACTION
+ int i;
+ int res;
+
+ res = sigprocmask (0, NULL, &original_signal_mask);
+ if (res == -1)
+ perror_with_name ("sigprocmask");
+
+ for (i = 1; i < NSIG; i++)
+ {
+ struct sigaction *oldact = &original_signal_actions[i];
+
+ res = sigaction (i, NULL, oldact);
+ if (res == -1 && errno == EINVAL)
+ {
+ /* Some signal numbers in the range are invalid. */
+ continue;
+ }
+ else if (res == -1)
+ perror_with_name ("sigaction");
+
+ /* If we find a custom signal handler already installed, then
+ this function was called too late. */
+ if (oldact->sa_handler != SIG_DFL && oldact->sa_handler != SIG_IGN)
+ internal_error (__FILE__, __LINE__, _("unexpected signal handler"));
+ }
+#endif
+}
+
+/* See signals-state-save-restore.h. */
+
+void
+restore_original_signals_state (void)
+{
+#ifdef HAVE_SIGACTION
+ int i;
+ int res;
+
+ for (i = 1; i < NSIG; i++)
+ {
+ res = sigaction (i, &original_signal_actions[i], NULL);
+ if (res == -1 && errno == EINVAL)
+ {
+ /* Some signal numbers in the range are invalid. */
+ continue;
+ }
+ else if (res == -1)
+ perror_with_name ("sigaction");
+ }
+
+ res = sigprocmask (SIG_SETMASK, &original_signal_mask, NULL);
+ if (res == -1)
+ perror_with_name ("sigprocmask");
+#endif
+}
diff --git a/gdb/common/signals-state-save-restore.h b/gdb/common/signals-state-save-restore.h
new file mode 100644
index 0000000..bed77fe
--- /dev/null
+++ b/gdb/common/signals-state-save-restore.h
@@ -0,0 +1,39 @@
+/* Copyright (C) 2016 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef COMMON_SIGNALS_STATE_SAVE_RESTORE_H
+#define COMMON_SIGNALS_STATE_SAVE_RESTORE_H
+
+/* Save/restore the signal actions of all signals, and the signal
+ mask.
+
+ Since the exec family of functions does not reset the signal
+ disposition of signals set to SIG_IGN, nor does it reset the signal
+ mask, in order to be transparent, when spawning new child processes
+ to debug (with "run", etc.), we must reset signal actions and mask
+ back to what was originally inherited from gdb/gdbserver's parent,
+ just before execing the target program to debug. */
+
+/* Save the signal state of all signals. */
+
+extern void save_original_signals_state (void);
+
+/* Restore the signal state of all signals. */
+
+extern void restore_original_signals_state (void);
+
+#endif /* COMMON_SIGNALS_STATE_SAVE_RESTORE_H */