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

6240d7
From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
6240d7
From: Fedora GDB patches <invalid@email.com>
6240d7
Date: Fri, 27 Oct 2017 21:07:50 +0200
6240d7
Subject: gdb-bz1219747-attach-kills.patch
6240d7
6240d7
;; Never kill PID on: gdb exec PID (Jan Kratochvil, RH BZ 1219747).
6240d7
;;=push+jan
6240d7
6240d7
http://sourceware.org/ml/gdb-patches/2015-10/msg00301.html
6240d7
6240d7
Hi,
6240d7
6240d7
in some cases with deleted main executable GDB will want to kill the inferior.
6240d7
6240d7
$ cp /bin/sleep /tmp/sleep;/tmp/sleep 1h&p=$!
6240d7
$ rm /tmp/sleep
6240d7
$ gdb /tmp/sleep $p
6240d7
GNU gdb (GDB) 7.10.50.20151016-cvs
6240d7
/tmp/sleep: No such file or directory.
6240d7
Attaching to process 9694
6240d7
/tmp/sleep (deleted): No such file or directory.
6240d7
A program is being debugged already.  Kill it? (y or n) _
6240d7
6240d7
The first attachment of "/tmp/sleep" commandline argument errors at:
6240d7
6240d7
267               if (scratch_chan < 0)
6240d7
268                 perror_with_name (filename);
6240d7
1051          if (catch_command_errors_const (exec_file_attach, execarg,
6240d7
1052                                          !batch_flag))
6240d7
6240d7
Then GDB tries to attach to the process $p:
6240d7
6240d7
1082              if (catch_command_errors (attach_command, pid_or_core_arg,
6240d7
1083                                        !batch_flag) == 0)
6240d7
6240d7
This succeeds and since this moment GDB has a valid inferior.  But despite that
6240d7
the lines
6240d7
1082              if (catch_command_errors (attach_command, pid_or_core_arg,
6240d7
1083                                        !batch_flag) == 0)
6240d7
still fail because consequently attach_command() fails to find the associated
6240d7
executable file:
6240d7
6240d7
267               if (scratch_chan < 0)
6240d7
268                 perror_with_name (filename);
6240d7
1082              if (catch_command_errors (attach_command, pid_or_core_arg,
6240d7
1083                                        !batch_flag) == 0)
6240d7
6240d7
and therefore GDB executes the following:
6240d7
6240d7
(gdb) bt
6240d7
2179	  if (have_inferiors ())
6240d7
2180	    {
6240d7
2181	      if (!from_tty
6240d7
2182		  || !have_live_inferiors ()
6240d7
2183		  || query (_("A program is being debugged already.  Kill it? ")))
6240d7
2184		iterate_over_inferiors (dispose_inferior, NULL);
6240d7
2185	      else
6240d7
2186		error (_("Program not killed."));
6240d7
2187	    }
6240d7
1084		    catch_command_errors (core_file_command, pid_or_core_arg,
6240d7
1085					  !batch_flag);
6240d7
6240d7
No regressions on {x86_64,x86_64-m32,i686}-fedora24pre-linux-gnu.
6240d7
6240d7
Thanks,
6240d7
Jan
6240d7
6240d7
gdb/ChangeLog
6240d7
2015-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
6240d7
6240d7
	* main.c (captured_main): Run core_file_command for pid_or_core_arg
6240d7
	only if not have_inferiors ().
6240d7
6240d7
gdb/testsuite/ChangeLog
6240d7
2015-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
6240d7
6240d7
	* gdb.base/attach-kills.c: New.
6240d7
	* gdb.base/attach-kills.exp: New.
6240d7
6240d7
diff --git a/gdb/main.c b/gdb/main.c
6240d7
--- a/gdb/main.c
6240d7
+++ b/gdb/main.c
6240d7
@@ -1129,7 +1129,10 @@ captured_main_1 (struct captured_main_args *context)
6240d7
 	{
6240d7
 	  ret = catch_command_errors (attach_command, pid_or_core_arg,
6240d7
 				      !batch_flag);
6240d7
-	  if (ret == 0)
6240d7
+	  if (ret == 0
6240d7
+	      /* attach_command could succeed partially and core_file_command
6240d7
+		 would try to kill it.  */
6240d7
+	      && !have_inferiors ())
6240d7
 	    ret = catch_command_errors (core_file_command,
6240d7
 					pid_or_core_arg,
6240d7
 					!batch_flag);
6240d7
diff --git a/gdb/testsuite/gdb.base/attach-kills.c b/gdb/testsuite/gdb.base/attach-kills.c
6240d7
new file mode 100644
6240d7
--- /dev/null
6240d7
+++ b/gdb/testsuite/gdb.base/attach-kills.c
6240d7
@@ -0,0 +1,25 @@
6240d7
+/* This testcase is part of GDB, the GNU debugger.
6240d7
+
6240d7
+   Copyright 2015 Free Software Foundation, Inc.
6240d7
+
6240d7
+   This program is free software; you can redistribute it and/or modify
6240d7
+   it under the terms of the GNU General Public License as published by
6240d7
+   the Free Software Foundation; either version 3 of the License, or
6240d7
+   (at your option) any later version.
6240d7
+
6240d7
+   This program is distributed in the hope that it will be useful,
6240d7
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
6240d7
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
6240d7
+   GNU General Public License for more details.
6240d7
+
6240d7
+   You should have received a copy of the GNU General Public License
6240d7
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
6240d7
+
6240d7
+#include <unistd.h>
6240d7
+
6240d7
+int
6240d7
+main (void)
6240d7
+{
6240d7
+  sleep (600);
6240d7
+  return 0;
6240d7
+}
6240d7
diff --git a/gdb/testsuite/gdb.base/attach-kills.exp b/gdb/testsuite/gdb.base/attach-kills.exp
6240d7
new file mode 100644
6240d7
--- /dev/null
6240d7
+++ b/gdb/testsuite/gdb.base/attach-kills.exp
6240d7
@@ -0,0 +1,49 @@
6240d7
+# Copyright (C) 2015 Free Software Foundation, Inc.
6240d7
+#
6240d7
+# This program is free software; you can redistribute it and/or modify
6240d7
+# it under the terms of the GNU General Public License as published by
6240d7
+# the Free Software Foundation; either version 3 of the License, or
6240d7
+# (at your option) any later version.
6240d7
+#
6240d7
+# This program is distributed in the hope that it will be useful,
6240d7
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
6240d7
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
6240d7
+# GNU General Public License for more details.
6240d7
+#
6240d7
+# You should have received a copy of the GNU General Public License
6240d7
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
6240d7
+
6240d7
+if { ![can_spawn_for_attach] } {
6240d7
+    return 0
6240d7
+}
6240d7
+
6240d7
+standard_testfile
6240d7
+
6240d7
+if { [build_executable ${testfile}.exp $testfile] == -1 } {
6240d7
+    return -1
6240d7
+}
6240d7
+
6240d7
+# Start the program running and then wait for a bit, to be sure
6240d7
+# that it can be attached to.
6240d7
+
6240d7
+set test_spawn_id [spawn_wait_for_attach $binfile]
6240d7
+set testpid [spawn_id_get_pid $test_spawn_id]
6240d7
+
6240d7
+remote_exec target "cp -pf -- $binfile $binfile-copy"
6240d7
+remote_exec target "rm -f -- $binfile"
6240d7
+
6240d7
+set test "start gdb"
6240d7
+set res [gdb_spawn_with_cmdline_opts \
6240d7
+	 "-iex \"set height 0\" -iex \"set width 0\" /DoEsNoTeXySt $testpid"]
6240d7
+if { $res != 0} {
6240d7
+    fail "$test (spawn)"
6240d7
+    kill_wait_spawned_process $test_spawn_id
6240d7
+    return -1
6240d7
+}
6240d7
+gdb_test_multiple "" $test {
6240d7
+    -re "\r\nAttaching to .*\r\n$gdb_prompt $" {
6240d7
+	pass $test
6240d7
+    }
6240d7
+}
6240d7
+
6240d7
+kill_wait_spawned_process $test_spawn_id