Fix loading of core files without build-ids but with build-ids in executables.

This commit is contained in:
Jan Kratochvil 2012-03-17 12:41:19 +01:00
parent 815858a515
commit d44acb3a33
3 changed files with 69 additions and 2 deletions

View File

@ -0,0 +1,60 @@
--- gdb-7.2/gdb/solib-svr4.c.orig 2012-03-17 09:39:54.874090162 +0100
+++ gdb-7.2/gdb/solib-svr4.c 2012-03-17 09:42:12.561810807 +0100
@@ -1179,14 +1179,30 @@ svr4_current_sos (void)
safe_strerror (errcode));
else
{
- struct build_id *build_id;
+ struct build_id *build_id = NULL;
strncpy (new->so_original_name, buffer, SO_NAME_MAX_PATH_SIZE - 1);
new->so_original_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
/* May get overwritten below. */
strcpy (new->so_name, new->so_original_name);
- build_id = build_id_addr_get (lm_dynamic_from_link_map (new));
+ /* In the case the main executable was found according to its
+ build-id (from a core file) prevent loading a different build
+ of a library with accidentally the same SO_NAME.
+
+ It suppresses bogus backtraces (and prints "??" there instead)
+ if the on-disk files no longer match the running program
+ version.
+
+ If the main executable was not loaded according to its
+ build-id do not do any build-id checking of the libraries.
+ There may be missing build-ids dumped in the core file and we
+ would map all the libraries to the only existing file loaded
+ that time - the executable. */
+
+ if (symfile_objfile != NULL
+ && (symfile_objfile->flags & OBJF_BUILD_ID_CORE_LOADED) != 0)
+ build_id = build_id_addr_get (lm_dynamic_from_link_map (new));
if (build_id != NULL)
{
char *name, *build_id_filename;
@@ -1224,23 +1240,7 @@ svr4_current_sos (void)
xfree (name);
}
else
- {
- debug_print_missing (new->so_name, build_id_filename);
-
- /* In the case the main executable was found according to
- its build-id (from a core file) prevent loading
- a different build of a library with accidentally the
- same SO_NAME.
-
- It suppresses bogus backtraces (and prints "??" there
- instead) if the on-disk files no longer match the
- running program version. */
-
- if (symfile_objfile != NULL
- && (symfile_objfile->flags
- & OBJF_BUILD_ID_CORE_LOADED) != 0)
- new->so_name[0] = 0;
- }
+ debug_print_missing (new->so_name, build_id_filename);
xfree (build_id_filename);
xfree (build_id);

View File

@ -57,7 +57,7 @@ Index: gdb-7.3.50.20110722/gdb/solib-svr4.c
+ }
else
{
struct build_id *build_id;
struct build_id *build_id = NULL;
Index: gdb-7.3.50.20110722/gdb/solib.c
===================================================================
--- gdb-7.3.50.20110722.orig/gdb/solib.c 2011-06-30 21:29:54.000000000 +0200

View File

@ -27,7 +27,7 @@ Version: 7.3.50.20110722
# The release always contains a leading reserved number, start it at 1.
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
Release: 12%{?_with_upstream:.upstream}%{?dist}
Release: 13%{?_with_upstream:.upstream}%{?dist}
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain
Group: Development/Debuggers
@ -297,6 +297,9 @@ Patch271: gdb-6.5-bz243845-stale-testing-zombie-test.patch
# New locating of the matching binaries from the pure core file (build-id).
#=push
Patch274: gdb-6.6-buildid-locate.patch
# Fix loading of core files without build-ids but with build-ids in executables.
#=push
Patch659: gdb-6.6-buildid-locate-solib-missing-ids.patch
#=push
Patch353: gdb-6.6-buildid-locate-rpm.patch
#=push
@ -768,6 +771,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c
%patch263 -p1
%patch271 -p1
%patch274 -p1
%patch659 -p1
%patch353 -p1
%patch282 -p1
%patch284 -p1
@ -1256,6 +1260,9 @@ fi
%{_infodir}/gdb.info*
%changelog
* Sat Mar 17 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.3.50.20110722-13.fc16
- Fix loading of core files without build-ids but with build-ids in executables.
* Wed Mar 1 2012 Sergio Durigan Junior <sergiodj@redhat.com> - 7.3.50.20110722-12.fc16
- Fix `corrupt probe' complaint when reading SystemTap probes.