Blame SOURCES/gdb-bz1326476-attach-kills.patch

0b42f8
http://sourceware.org/ml/gdb-patches/2015-10/msg00301.html
0b42f8
Subject: [PATCH 1/3] Never kill PID on: gdb exec PID
0b42f8
0b42f8
Hi,
0b42f8
0b42f8
in some cases with deleted main executable GDB will want to kill the inferior.
0b42f8
0b42f8
$ cp /bin/sleep /tmp/sleep;/tmp/sleep 1h&p=$!
0b42f8
$ rm /tmp/sleep
0b42f8
$ gdb /tmp/sleep $p
0b42f8
GNU gdb (GDB) 7.10.50.20151016-cvs
0b42f8
/tmp/sleep: No such file or directory.
0b42f8
Attaching to process 9694
0b42f8
/tmp/sleep (deleted): No such file or directory.
0b42f8
A program is being debugged already.  Kill it? (y or n) _
0b42f8
0b42f8
The first attachment of "/tmp/sleep" commandline argument errors at:
0b42f8
0b42f8
#0  throw_error (error=GENERIC_ERROR, fmt=0x116d135 "%s.") at ./common/common-exceptions.c:371
0b42f8
#1  in throw_perror_with_name (errcode=GENERIC_ERROR, string=0x7fffffffdb96 "/dfsfds") at utils.c:974
0b42f8
#2  in perror_with_name (string=0x7fffffffdb96 "/dfsfds") at utils.c:982
0b42f8
#3  in exec_file_attach (filename=0x7fffffffdb96 "/dfsfds", from_tty=1) at exec.c:268
0b42f8
267               if (scratch_chan < 0)
0b42f8
268                 perror_with_name (filename);
0b42f8
#4  in catch_command_errors_const (command=0x80f59f <exec_file_attach>, arg=0x7fffffffdb96 "/dfsfds", from_tty=1) at main.c:395
0b42f8
#5  in captured_main (data=0x7fffffffd6f0) at main.c:1051
0b42f8
1051          if (catch_command_errors_const (exec_file_attach, execarg,
0b42f8
1052                                          !batch_flag))
0b42f8
0b42f8
Then GDB tries to attach to the process $p:
0b42f8
0b42f8
#0  inferior_appeared (inf=0x240e0b0, pid=29210) at inferior.c:305
0b42f8
#1  in inf_ptrace_attach (ops=0x2339540, args=0x21dcdc0 "29210", from_tty=1) at inf-ptrace.c:206
0b42f8
#2  in linux_nat_attach (ops=0x2339540, args=0x21dcdc0 "29210", from_tty=1) at linux-nat.c:1278
0b42f8
#3  in attach_command (args=0x21dcdc0 "29210", from_tty=1) at infcmd.c:2748
0b42f8
#4  in catch_command_errors (command=0x79d7e5 <attach_command>, arg=0x7fffffffdb9e "29210", from_tty=1) at main.c:368
0b42f8
#5  in captured_main (data=0x7fffffffd6f0) at main.c:1082
0b42f8
1082              if (catch_command_errors (attach_command, pid_or_core_arg,
0b42f8
1083                                        !batch_flag) == 0)
0b42f8
0b42f8
This succeeds and since this moment GDB has a valid inferior.  But despite that
0b42f8
the lines
0b42f8
1082              if (catch_command_errors (attach_command, pid_or_core_arg,
0b42f8
1083                                        !batch_flag) == 0)
0b42f8
still fail because consequently attach_command() fails to find the associated
0b42f8
executable file:
0b42f8
0b42f8
#0  throw_error (error=GENERIC_ERROR, fmt=0x116d135 "%s.") at ./common/common-exceptions.c:371
0b42f8
#1  in throw_perror_with_name (errcode=GENERIC_ERROR, string=0x2477860 "/tmp/sleep (deleted)") at utils.c:974
0b42f8
#2  in perror_with_name (string=0x2477860 "/tmp/sleep (deleted)") at utils.c:982
0b42f8
#3  in exec_file_attach (filename=0x2477860 "/tmp/sleep (deleted)", from_tty=1) at exec.c:268
0b42f8
267               if (scratch_chan < 0)
0b42f8
268                 perror_with_name (filename);
0b42f8
#4  in exec_file_locate_attach (pid=29210, from_tty=1) at exec.c:173
0b42f8
#5  in attach_command_post_wait (args=0x24739b0 "29210", from_tty=1, async_exec=0) at infcmd.c:2628
0b42f8
#6  in attach_command_continuation (args=0x2473590, err=0) at infcmd.c:2700
0b42f8
#7  in do_my_continuations_1 (pmy_chain=0x7fffffffd190, err=0) at continuations.c:59
0b42f8
#8  in do_my_continuations (list=0x240e130, err=0) at continuations.c:83
0b42f8
#9  in do_all_inferior_continuations (err=0) at continuations.c:125
0b42f8
#10 in inferior_event_handler (event_type=INF_EXEC_COMPLETE, client_data=0x0) at inf-loop.c:60
0b42f8
#11 in fetch_inferior_event (client_data=0x0) at infrun.c:3929
0b42f8
#12 in inferior_event_handler (event_type=INF_REG_EVENT, client_data=0x0) at inf-loop.c:44
0b42f8
#13 in handle_target_event (error=0, client_data=0x0) at linux-nat.c:4681
0b42f8
#14 in handle_file_event (file_ptr=0x21e4170, ready_mask=1) at event-loop.c:708
0b42f8
#15 in gdb_wait_for_event (block=0) at event-loop.c:834
0b42f8
#16 in gdb_do_one_event () at event-loop.c:298
0b42f8
#17 in wait_sync_command_done () at top.c:373
0b42f8
#18 in maybe_wait_sync_command_done (was_sync=0) at top.c:388
0b42f8
#19 in catch_command_errors (command=0x79d7e5 <attach_command>, arg=0x7fffffffdb9e "29210", from_tty=1) at main.c:370
0b42f8
#20 in captured_main (data=0x7fffffffd6f0) at main.c:1082
0b42f8
1082              if (catch_command_errors (attach_command, pid_or_core_arg,
0b42f8
1083                                        !batch_flag) == 0)
0b42f8
0b42f8
and therefore GDB executes the following:
0b42f8
0b42f8
(gdb) bt
0b42f8
#5  in query (ctlstr=0x1141ae8 "A program is being debugged already.  Kill it? ") at utils.c:1371
0b42f8
#6  in target_preopen (from_tty=1) at target.c:2183
0b42f8
2179	  if (have_inferiors ())
0b42f8
2180	    {
0b42f8
2181	      if (!from_tty
0b42f8
2182		  || !have_live_inferiors ()
0b42f8
2183		  || query (_("A program is being debugged already.  Kill it? ")))
0b42f8
2184		iterate_over_inferiors (dispose_inferior, NULL);
0b42f8
2185	      else
0b42f8
2186		error (_("Program not killed."));
0b42f8
2187	    }
0b42f8
#7  in core_open (arg=0x7fffffffdb9f "9694", from_tty=1) at corelow.c:283
0b42f8
#8  in core_file_command (filename=0x7fffffffdb9f "9694", from_tty=1) at corefile.c:77
0b42f8
#9  in catch_command_errors (command=0x86ca16 <core_file_command>, arg=0x7fffffffdb9f "9694", from_tty=1) at main.c:368
0b42f8
#10 in captured_main (data=0x7fffffffd6f0) at main.c:1084
0b42f8
1084		    catch_command_errors (core_file_command, pid_or_core_arg,
0b42f8
1085					  !batch_flag);
0b42f8
0b42f8
No regressions on {x86_64,x86_64-m32,i686}-fedora24pre-linux-gnu.
0b42f8
0b42f8
0b42f8
Thanks,
0b42f8
Jan
0b42f8
0b42f8
0b42f8
gdb/ChangeLog
0b42f8
2015-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
0b42f8
0b42f8
	* main.c (captured_main): Run core_file_command for pid_or_core_arg
0b42f8
	only if not have_inferiors ().
0b42f8
0b42f8
gdb/testsuite/ChangeLog
0b42f8
2015-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
0b42f8
0b42f8
	* gdb.base/attach-kills.c: New.
0b42f8
	* gdb.base/attach-kills.exp: New.
0b42f8
---
0b42f8
 gdb/testsuite/gdb.base/attach-kills.c   |   25 ++++++++++++++++
0b42f8
 gdb/testsuite/gdb.base/attach-kills.exp |   49 +++++++++++++++++++++++++++++++
0b42f8
 2 files changed, 74 insertions(+)
0b42f8
 create mode 100644 gdb/testsuite/gdb.base/attach-kills.c
0b42f8
 create mode 100644 gdb/testsuite/gdb.base/attach-kills.exp
0b42f8
0b42f8
Index: gdb-7.2/gdb/main.c
0b42f8
===================================================================
0b42f8
--- gdb-7.2.orig/gdb/main.c	2015-10-16 22:53:14.000000000 +0200
0b42f8
+++ gdb-7.2/gdb/main.c	2015-10-16 22:53:58.840722140 +0200
0b42f8
@@ -975,7 +975,10 @@ Can't attach to process and specify a co
0b42f8
       if (isdigit (pid_or_core_arg[0]))
0b42f8
 	{
0b42f8
 	  if (catch_command_errors (attach_command, pid_or_core_arg,
0b42f8
-				    !batch_flag, RETURN_MASK_ALL) == 0)
0b42f8
+				    !batch_flag, RETURN_MASK_ALL) == 0
0b42f8
+	      /* attach_command could succeed partially and core_file_command
0b42f8
+		 would try to kill it.  */
0b42f8
+	      && !have_inferiors ())
0b42f8
 	    catch_command_errors (core_file_command, pid_or_core_arg,
0b42f8
 				  !batch_flag, RETURN_MASK_ALL);
0b42f8
 	}
0b42f8
Index: gdb-7.2/gdb/testsuite/gdb.base/attach-kills.c
0b42f8
===================================================================
0b42f8
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
0b42f8
+++ gdb-7.2/gdb/testsuite/gdb.base/attach-kills.c	2015-10-16 22:53:22.843486331 +0200
0b42f8
@@ -0,0 +1,25 @@
0b42f8
+/* This testcase is part of GDB, the GNU debugger.
0b42f8
+
0b42f8
+   Copyright 2015 Free Software Foundation, Inc.
0b42f8
+
0b42f8
+   This program is free software; you can redistribute it and/or modify
0b42f8
+   it under the terms of the GNU General Public License as published by
0b42f8
+   the Free Software Foundation; either version 3 of the License, or
0b42f8
+   (at your option) any later version.
0b42f8
+
0b42f8
+   This program is distributed in the hope that it will be useful,
0b42f8
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
0b42f8
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
0b42f8
+   GNU General Public License for more details.
0b42f8
+
0b42f8
+   You should have received a copy of the GNU General Public License
0b42f8
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
0b42f8
+
0b42f8
+#include <unistd.h>
0b42f8
+
0b42f8
+int
0b42f8
+main (void)
0b42f8
+{
0b42f8
+  sleep (600);
0b42f8
+  return 0;
0b42f8
+}
0b42f8
Index: gdb-7.2/gdb/testsuite/gdb.base/attach-kills.exp
0b42f8
===================================================================
0b42f8
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
0b42f8
+++ gdb-7.2/gdb/testsuite/gdb.base/attach-kills.exp	2015-10-16 23:02:33.791095444 +0200
0b42f8
@@ -0,0 +1,39 @@
0b42f8
+# Copyright (C) 2015 Free Software Foundation, Inc.
0b42f8
+#
0b42f8
+# This program is free software; you can redistribute it and/or modify
0b42f8
+# it under the terms of the GNU General Public License as published by
0b42f8
+# the Free Software Foundation; either version 3 of the License, or
0b42f8
+# (at your option) any later version.
0b42f8
+#
0b42f8
+# This program is distributed in the hope that it will be useful,
0b42f8
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
0b42f8
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
0b42f8
+# GNU General Public License for more details.
0b42f8
+#
0b42f8
+# You should have received a copy of the GNU General Public License
0b42f8
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
0b42f8
+
0b42f8
+set testfile attach-kills
0b42f8
+set binfile ${objdir}/${subdir}/${testfile}
0b42f8
+
0b42f8
+if { [build_executable ${testfile}.exp $testfile] == -1 } {
0b42f8
+    return -1
0b42f8
+}
0b42f8
+
0b42f8
+# Start the program running and then wait for a bit, to be sure
0b42f8
+# that it can be attached to.
0b42f8
+
0b42f8
+set testpid [eval exec $binfile &]
0b42f8
+exec sleep 2
0b42f8
+
0b42f8
+remote_exec target "cp -pf -- $binfile $binfile-copy"
0b42f8
+remote_exec target "rm -f -- $binfile"
0b42f8
+
0b42f8
+set GDBFLAGS_orig $GDBFLAGS
0b42f8
+set GDBFLAGS "$GDBFLAGS /DoEsNoTeXySt $testpid"
0b42f8
+gdb_start
0b42f8
+set GDBFLAGS $GDBFLAGS_orig
0b42f8
+
0b42f8
+gdb_test "info inferiors" " process \[0-9\].*"
0b42f8
+
0b42f8
+remote_exec build "kill -9 ${testpid}"