a8767b
From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
f524ac
From: Fedora GDB patches <invalid@email.com>
f524ac
Date: Fri, 27 Oct 2017 21:07:50 +0200
f524ac
Subject: gdb-6.6-buildid-locate-solib-missing-ids.patch
f524ac
f63797
;; Fix loading of core files without build-ids but with build-ids in executables.
f63797
;; Load strictly build-id-checked core files only if no executable is specified
f63797
;; (Jan Kratochvil, RH BZ 1339862).
f63797
;;=push+jan
f524ac
5c5eb1
gdb returns an incorrect back trace when applying a debuginfo
5c5eb1
https://bugzilla.redhat.com/show_bug.cgi?id=1339862
5c5eb1
f63797
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
f63797
--- a/gdb/solib-svr4.c
f63797
+++ b/gdb/solib-svr4.c
0a2f2a
@@ -1346,14 +1346,27 @@ svr4_read_so_list (svr4_info *info, CORE_ADDR lm, CORE_ADDR prev_lm,
3d3c8f
 	}
3d3c8f
 
3d3c8f
       {
ae96b4
-	struct bfd_build_id *build_id;
ae96b4
+	struct bfd_build_id *build_id = NULL;
3d3c8f
 
2bcd68
 	strncpy (newobj->so_original_name, buffer.get (), SO_NAME_MAX_PATH_SIZE - 1);
32f92b
 	newobj->so_original_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
3d3c8f
 	/* May get overwritten below.  */
32f92b
 	strcpy (newobj->so_name, newobj->so_original_name);
3d3c8f
 
2bcd68
-	build_id = build_id_addr_get (((lm_info_svr4 *) newobj->lm_info)->l_ld);
3d3c8f
+	/* In the case the main executable was found according to its build-id
3d3c8f
+	   (from a core file) prevent loading a different build of a library
3d3c8f
+	   with accidentally the same SO_NAME.
3d3c8f
+
3d3c8f
+	   It suppresses bogus backtraces (and prints "??" there instead) if
3d3c8f
+	   the on-disk files no longer match the running program version.
3d3c8f
+
3d3c8f
+	   If the main executable was not loaded according to its build-id do
3d3c8f
+	   not do any build-id checking of the libraries.  There may be missing
3d3c8f
+	   build-ids dumped in the core file and we would map all the libraries
3d3c8f
+	   to the only existing file loaded that time - the executable.  */
3d3c8f
+	if (symfile_objfile != NULL
3d3c8f
+	    && (symfile_objfile->flags & OBJF_BUILD_ID_CORE_LOADED) != 0)
f63797
+	  build_id = build_id_addr_get (li->l_ld);
3d3c8f
 	if (build_id != NULL)
3d3c8f
 	  {
3d3c8f
 	    char *name, *build_id_filename;
0a2f2a
@@ -1368,23 +1381,7 @@ svr4_read_so_list (svr4_info *info, CORE_ADDR lm, CORE_ADDR prev_lm,
3d3c8f
 		xfree (name);
3d3c8f
 	      }
3d3c8f
 	    else
3d3c8f
-	      {
32f92b
-		debug_print_missing (newobj->so_name, build_id_filename);
3d3c8f
-
3d3c8f
-		/* In the case the main executable was found according to
3d3c8f
-		   its build-id (from a core file) prevent loading
3d3c8f
-		   a different build of a library with accidentally the
3d3c8f
-		   same SO_NAME.
3d3c8f
-
3d3c8f
-		   It suppresses bogus backtraces (and prints "??" there
3d3c8f
-		   instead) if the on-disk files no longer match the
3d3c8f
-		   running program version.  */
3d3c8f
-
3d3c8f
-		if (symfile_objfile != NULL
3d3c8f
-		    && (symfile_objfile->flags
3d3c8f
-			& OBJF_BUILD_ID_CORE_LOADED) != 0)
32f92b
-		  newobj->so_name[0] = 0;
3d3c8f
-	      }
32f92b
+	      debug_print_missing (newobj->so_name, build_id_filename);
3d3c8f
 
3d3c8f
 	    xfree (build_id_filename);
3d3c8f
 	    xfree (build_id);
f63797
diff --git a/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-lib.c b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-lib.c
f63797
new file mode 100644
f63797
--- /dev/null
f63797
+++ b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-lib.c
f63797
@@ -0,0 +1,21 @@
f63797
+/* Copyright 2010 Free Software Foundation, Inc.
f63797
+
f63797
+   This file is part of GDB.
f63797
+
f63797
+   This program is free software; you can redistribute it and/or modify
f63797
+   it under the terms of the GNU General Public License as published by
f63797
+   the Free Software Foundation; either version 3 of the License, or
f63797
+   (at your option) any later version.
f63797
+
f63797
+   This program is distributed in the hope that it will be useful,
f63797
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
f63797
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
f63797
+   GNU General Public License for more details.
f63797
+
f63797
+   You should have received a copy of the GNU General Public License
f63797
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
f63797
+
f63797
+void
f63797
+lib (void)
f63797
+{
f63797
+}
f63797
diff --git a/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-main.c b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-main.c
f63797
new file mode 100644
f63797
--- /dev/null
f63797
+++ b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib-main.c
f63797
@@ -0,0 +1,25 @@
f63797
+/* Copyright 2010 Free Software Foundation, Inc.
f63797
+
f63797
+   This file is part of GDB.
f63797
+
f63797
+   This program is free software; you can redistribute it and/or modify
f63797
+   it under the terms of the GNU General Public License as published by
f63797
+   the Free Software Foundation; either version 3 of the License, or
f63797
+   (at your option) any later version.
f63797
+
f63797
+   This program is distributed in the hope that it will be useful,
f63797
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
f63797
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
f63797
+   GNU General Public License for more details.
f63797
+
f63797
+   You should have received a copy of the GNU General Public License
f63797
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
f63797
+
f63797
+extern void lib (void);
f63797
+
f63797
+int
f63797
+main (void)
f63797
+{
f63797
+  lib ();
f63797
+  return 0;
f63797
+}
f63797
diff --git a/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib.exp b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib.exp
f63797
new file mode 100644
f63797
--- /dev/null
f63797
+++ b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib.exp
5c5eb1
@@ -0,0 +1,105 @@
5c5eb1
+# Copyright 2016 Free Software Foundation, Inc.
5c5eb1
+
5c5eb1
+# This program is free software; you can redistribute it and/or modify
5c5eb1
+# it under the terms of the GNU General Public License as published by
5c5eb1
+# the Free Software Foundation; either version 3 of the License, or
5c5eb1
+# (at your option) any later version.
5c5eb1
+#
5c5eb1
+# This program is distributed in the hope that it will be useful,
5c5eb1
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
5c5eb1
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
5c5eb1
+# GNU General Public License for more details.
5c5eb1
+#
5c5eb1
+# You should have received a copy of the GNU General Public License
5c5eb1
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
5c5eb1
+
5c5eb1
+if {[skip_shlib_tests]} {
5c5eb1
+    return 0
5c5eb1
+}
5c5eb1
+
5c5eb1
+set testfile "gcore-buildid-exec-but-not-solib"
5c5eb1
+set srcmainfile ${testfile}-main.c
5c5eb1
+set srclibfile ${testfile}-lib.c
5c5eb1
+set libfile [standard_output_file ${testfile}-lib.so]
5c5eb1
+set objfile [standard_output_file ${testfile}-main.o]
5c5eb1
+set executable ${testfile}-main
5c5eb1
+set binfile [standard_output_file ${executable}]
5c5eb1
+set gcorefile [standard_output_file ${executable}.gcore]
5c5eb1
+set outdir [file dirname $binfile]
5c5eb1
+
5c5eb1
+if { [gdb_compile_shlib ${srcdir}/${subdir}/${srclibfile} ${libfile} "debug additional_flags=-Wl,--build-id"] != ""
5c5eb1
+     || [gdb_compile ${srcdir}/${subdir}/${srcmainfile} ${objfile} object {debug}] != "" } {
5c5eb1
+     unsupported "-Wl,--build-id compilation failed"
5c5eb1
+     return -1
5c5eb1
+}
5c5eb1
+set opts [list debug shlib=${libfile} "additional_flags=-Wl,--build-id"]
5c5eb1
+if { [gdb_compile ${objfile} ${binfile} executable $opts] != "" } {
5c5eb1
+     unsupported "-Wl,--build-id compilation failed"
5c5eb1
+     return -1
5c5eb1
+}
5c5eb1
+
5c5eb1
+clean_restart $executable
5c5eb1
+gdb_load_shlib $libfile
5c5eb1
+
5c5eb1
+# Does this gdb support gcore?
5c5eb1
+set test "help gcore"
5c5eb1
+gdb_test_multiple $test $test {
5c5eb1
+    -re "Undefined command: .gcore.*\r\n$gdb_prompt $" {
5c5eb1
+	# gcore command not supported -- nothing to test here.
5c5eb1
+	unsupported "gdb does not support gcore on this target"
5c5eb1
+	return -1;
5c5eb1
+    }
5c5eb1
+    -re "Save a core file .*\r\n$gdb_prompt $" {
5c5eb1
+	pass $test
5c5eb1
+    }
5c5eb1
+}
5c5eb1
+
5c5eb1
+if { ![runto lib] } then {
5c5eb1
+    return -1
5c5eb1
+}
5c5eb1
+
5c5eb1
+set escapedfilename [string_to_regexp ${gcorefile}]
5c5eb1
+
5c5eb1
+set test "save a corefile"
5c5eb1
+gdb_test_multiple "gcore ${gcorefile}" $test {
5c5eb1
+    -re "Saved corefile ${escapedfilename}\r\n$gdb_prompt $" {
5c5eb1
+	pass $test
5c5eb1
+    }
5c5eb1
+    -re "Can't create a corefile\r\n$gdb_prompt $" {
5c5eb1
+	unsupported $test
5c5eb1
+	return -1
5c5eb1
+    }
5c5eb1
+}
5c5eb1
+
5c5eb1
+# Now restart gdb and load the corefile.
5c5eb1
+
5c5eb1
+clean_restart $executable
5c5eb1
+gdb_load_shlib $libfile
5c5eb1
+
5c5eb1
+set buildid [build_id_debug_filename_get $libfile]
5c5eb1
+
5c5eb1
+regsub {\.debug$} $buildid {} buildid
5c5eb1
+
5c5eb1
+set debugdir [standard_output_file ${testfile}-debugdir]
5c5eb1
+file delete -force -- $debugdir
5c5eb1
+
5c5eb1
+file mkdir $debugdir/[file dirname $libfile]
5c5eb1
+file copy $libfile $debugdir/${libfile}
5c5eb1
+
5c5eb1
+file mkdir $debugdir/[file dirname $buildid]
5c5eb1
+file copy $libfile $debugdir/${buildid}
5c5eb1
+
5c5eb1
+remote_exec build "ln -s /lib       ${debugdir}/"
5c5eb1
+remote_exec build "ln -s /lib64     ${debugdir}/"
5c5eb1
+# /usr is not needed, all the libs are in /lib64: libm.so.6 libc.so.6 ld-linux-x86-64.so.2
5c5eb1
+
5c5eb1
+gdb_test "set solib-absolute-prefix $debugdir"
5c5eb1
+
5c5eb1
+gdb_test_no_output "set debug-file-directory $debugdir" "set debug-file-directory"
5c5eb1
+
5c5eb1
+gdb_test "core ${gcorefile}" "Core was generated by .*" "re-load generated corefile"
5c5eb1
+
5c5eb1
+gdb_test "frame" "#0 \[^\r\n\]* lib .*" "library got loaded"
5c5eb1
+
5c5eb1
+gdb_test "bt"
5c5eb1
+gdb_test "info shared"