diff options
author | Pedro Alves <palves@redhat.com> | 2016-08-09 20:16:20 +0100 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2016-08-09 20:16:20 +0100 |
commit | f348d89aeccaf3eb613e2f31a823baa64300bf88 (patch) | |
tree | 66f0119540539603832d1b3170848b1f9711b43a /gdb/gdbserver | |
parent | 7cfee229f1eb6e3ee98b63918a5189a330284751 (diff) | |
download | gdb-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/gdbserver')
-rw-r--r-- | gdb/gdbserver/ChangeLog | 13 | ||||
-rw-r--r-- | gdb/gdbserver/Makefile.in | 4 | ||||
-rw-r--r-- | gdb/gdbserver/config.in | 3 | ||||
-rwxr-xr-x | gdb/gdbserver/configure | 2 | ||||
-rw-r--r-- | gdb/gdbserver/linux-low.c | 4 | ||||
-rw-r--r-- | gdb/gdbserver/server.c | 4 |
6 files changed, 27 insertions, 3 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index e88b001..6986714 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,16 @@ +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. + 2016-08-05 Pedro Alves <palves@redhat.com> * configure: Regenerate. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 2be61ef..bed2b1e 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -200,6 +200,7 @@ OBS = agent.o ax.o inferiors.o regcache.o remote-utils.o server.o signals.o \ common-utils.o ptid.o buffer.o format.o filestuff.o dll.o notif.o \ tdesc.o print-utils.o rsp-low.o errors.o common-debug.o cleanups.o \ common-exceptions.o symbol.o btrace-common.o fileio.o common-regcache.o \ + signals-state-save-restore.o \ $(XML_BUILTIN) $(DEPFILES) $(LIBOBJS) GDBREPLAY_OBS = gdbreplay.o version.o GDBSERVER_LIBS = @GDBSERVER_LIBS@ @@ -715,6 +716,9 @@ fileio.o: ../common/fileio.c common-regcache.o: ../common/common-regcache.c $(COMPILE) $< $(POSTCOMPILE) +signals-state-save-restore.o: ../common/signals-state-save-restore.c + $(COMPILE) $< + $(POSTCOMPILE) # Arch object files rules form ../arch diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in index 2c3a69a..04072cf 100644 --- a/gdb/gdbserver/config.in +++ b/gdb/gdbserver/config.in @@ -202,6 +202,9 @@ /* Define to 1 if you have the <sgtty.h> header file. */ #undef HAVE_SGTTY_H +/* Define to 1 if you have the `sigaction' function. */ +#undef HAVE_SIGACTION + /* Define to 1 if you have the <signal.h> header file. */ #undef HAVE_SIGNAL_H diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index 80fa1f3..889e35b 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -5913,7 +5913,7 @@ fi done - for ac_func in fdwalk getrlimit pipe pipe2 socketpair + for ac_func in fdwalk getrlimit pipe pipe2 socketpair sigaction do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 1839f99..45061ac 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -22,7 +22,7 @@ #include "agent.h" #include "tdesc.h" #include "rsp-low.h" - +#include "signals-state-save-restore.h" #include "nat/linux-nat.h" #include "nat/linux-waitpid.h" #include "gdb_wait.h" @@ -975,6 +975,8 @@ linux_create_inferior (char *program, char **allargs) } } + restore_original_signals_state (); + execv (program, allargs); if (errno == ENOENT) execvp (program, allargs); diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index 6d6cb09..6fbd61d 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -22,7 +22,7 @@ #include "notif.h" #include "tdesc.h" #include "rsp-low.h" - +#include "signals-state-save-restore.h" #include <ctype.h> #include <unistd.h> #if HAVE_SIGNAL_H @@ -3611,6 +3611,8 @@ captured_main (int argc, char *argv[]) opened by remote_prepare. */ notice_open_fds (); + save_original_signals_state (); + /* We need to know whether the remote connection is stdio before starting the inferior. Inferiors created in this scenario have stdin,stdout redirected. So do this here before we call |