From 2ee26b3c6e58afb72b674289ce8654d62e7bd693 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Fri, 26 Mar 2010 19:15:23 +0000 Subject: [PATCH] - Fix incorrect relocation of sections with duplicate name (BZ 575737). --- gdb-bz575737-pie-duplicate-section-name.patch | 191 ++++++++++++++++++ gdb.spec | 9 +- 2 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 gdb-bz575737-pie-duplicate-section-name.patch diff --git a/gdb-bz575737-pie-duplicate-section-name.patch b/gdb-bz575737-pie-duplicate-section-name.patch new file mode 100644 index 0000000..8fa5ad0 --- /dev/null +++ b/gdb-bz575737-pie-duplicate-section-name.patch @@ -0,0 +1,191 @@ +http://sourceware.org/ml/gdb-patches/2010-03/msg00799.html +Subject: [patch] Fix separate-debug with non-unique section names (PR 11409) + +A different version was checked-in but they are interchangeable: + http://sourceware.org/ml/gdb-patches/2010-03/msg00799.html + http://sourceware.org/ml/gdb-cvs/2010-03/msg00241.html + +Hi, + +gdb-7.1 is now broken for example for debugging /usr/bin/emacs due to: +http://sourceware.org/bugzilla/show_bug.cgi?id=11409 + [22] .data PROGBITS 00000000007fe8a0 1fe8a0 215068 00 WA 0 0 32 + [23] .data PROGBITS 0000000000a13920 413920 68c6e0 00 WA 0 0 32 + +It is in fact a regression against gdb-7.0 by me due to: + +commit 71d0069a9f238a11f7f455bf6ad2adfc25683521 +Author: Jan Kratochvil +Date: Tue Jan 5 15:51:01 2010 +0000 + +gdb/ + * symfile.c (syms_from_objfile): Remove the !MAINLINE conditional. + +as while the code was broken even before the broken relocation was not applied +to mainline binary (before PIE+OSX patches went in). + + +No regressions on {x86_64,x86_64-m32,i686}-fedora12-linux-gnu. + +OK to check-in also for gdb-7.1 (7.1.1)? + + +Thanks, +Jan + + +gdb/ +2010-03-23 Jan Kratochvil + + * symfile.c (addr_info_make_relative): Move sect declaration to the + outer block. Initialize it to NULL. Prefer SECT->next more than + bfd_get_section_by_name. + +gdb/testsuite/ +2010-03-23 Jan Kratochvil + + * gdb.base/dup-sect.exp, gdb.base/dup-sect.S: New. + +--- a/gdb/symfile.c ++++ b/gdb/symfile.c +@@ -529,6 +529,7 @@ addr_info_make_relative (struct section_addr_info *addrs, bfd *abfd) + asection *lower_sect; + CORE_ADDR lower_offset; + int i; ++ asection *sect; + + /* Find lowest loadable section to be used as starting point for + continguous sections. FIXME!! won't work without call to find +@@ -553,11 +554,23 @@ addr_info_make_relative (struct section_addr_info *addrs, bfd *abfd) + (the loadable section directly below it in memory). + this_offset = lower_offset = lower_addr - lower_orig_addr */ + ++ sect = NULL; + for (i = 0; i < addrs->num_sections && addrs->other[i].name; i++) + { + const char *sect_name = addrs->other[i].name; +- asection *sect = bfd_get_section_by_name (abfd, sect_name); + ++ /* Prefer the next section of that we have found last. The separate ++ debug info files have either the same section layout or just a few ++ sections are missing there. On the other hand the section name is not ++ unique and we could find an inappropraite section by its name. */ ++ ++ if (sect) ++ sect = sect->next; ++ if (sect && strcmp (sect_name, bfd_get_section_name (abfd, sect)) != 0) ++ sect = NULL; ++ ++ if (sect == NULL) ++ sect = bfd_get_section_by_name (abfd, sect_name); + if (sect) + { + /* This is the index used by BFD. */ +--- /dev/null ++++ b/gdb/testsuite/gdb.base/dup-sect.S +@@ -0,0 +1,22 @@ ++/* This testcase is part of GDB, the GNU debugger. ++ ++ Copyright 2010 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++ .section sect1, "a" ++var1: .byte 1 ++ ++ .section sect2, "a" ++var2: .byte 2 +--- /dev/null ++++ b/gdb/testsuite/gdb.base/dup-sect.exp +@@ -0,0 +1,79 @@ ++# This testcase is part of GDB, the GNU debugger. ++ ++# Copyright 2010 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++# Test inappropriate offseting of multiple sections with the same name. ++# When kept in object file (before final executable link) it still works. ++# When separate debug info file is not used it still works. ++# When the ELF symbol table is kept in the main binary it still works. ++# Used .S file as in .c file we would need __attriute__((section)) which is ++# a GCC extension. ++ ++# This test can only be run on targets which support ELF and use gas. ++# For now pick a sampling of likely targets. ++if {![istarget *-*-linux*] ++ && ![istarget *-*-gnu*] ++ && ![istarget *-*-elf*] ++ && ![istarget arm-*-eabi*] ++ && ![istarget powerpc-*-eabi*]} { ++ return 0 ++} ++ ++set testfile dup-sect ++set srcfile ${testfile}.S ++set srcmainfile start.c ++set executable ${testfile} ++set binfile ${objdir}/${subdir}/${executable} ++ ++if {[build_executable ${testfile}.exp $executable [list ${srcfile} ${srcmainfile}] {}] == -1} { ++ return -1 ++} ++ ++set test "rename section" ++set objcopy_program [transform objcopy] ++set result [catch "exec $objcopy_program --rename-section sect2=sect1 $binfile" output] ++verbose "result is $result" ++verbose "output is $output" ++if {$result != 0} { ++ fail $test ++ return ++} ++pass $test ++ ++set test "split" ++if {[gdb_gnu_strip_debug $binfile] != 0} { ++ fail $test ++} else { ++ pass $test ++} ++ ++# gdb_gnu_strip_debug uses only --strip-debug and keeps the ELF symbol table ++# in $binfile. ++set test "strip" ++set strip_program [transform strip] ++set result [catch "exec $strip_program $binfile" output] ++verbose "result is $result" ++verbose "output is $output" ++if {$result != 0} { ++ fail $test ++ return ++} ++pass $test ++ ++clean_restart $executable ++ ++gdb_test "p/d *(const char *) &var1" " = 1" "var1 after strip" ++gdb_test "p/d *(const char *) &var2" " = 2" "var2 after strip" + diff --git a/gdb.spec b/gdb.spec index 5acbfbc..0b4ecce 100644 --- a/gdb.spec +++ b/gdb.spec @@ -36,7 +36,7 @@ Version: 7.0.1 # 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: 35%{?_with_upstream:.upstream}%{dist}.1 +Release: 36%{?_with_upstream:.upstream}%{dist} License: GPLv3+ Group: Development/Debuggers @@ -489,6 +489,9 @@ Patch428: gdb-bz561784-lazy-psymtabs-clear.patch # Fix double-free on std::terminate handler (Tom Tromey, BZ 562975). Patch429: gdb-bz562975-std-terminate-double-free.patch +# Fix incorrect relocation of sections with duplicate name (BZ 575737). +Patch431: gdb-bz575737-pie-duplicate-section-name.patch + BuildRequires: ncurses-devel%{?_isa} texinfo gettext flex bison expat-devel%{?_isa} Requires: readline%{?_isa} BuildRequires: readline-devel%{?_isa} @@ -756,6 +759,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c %patch427 -p1 %patch428 -p1 %patch429 -p1 +%patch431 -p1 # Always verify their applicability. %patch393 -p1 %patch335 -p1 @@ -1081,6 +1085,9 @@ fi %endif %changelog +* Fri Mar 26 2010 Dennis Gilmore - 7.0.1-36.fc12 +- Fix incorrect relocation of sections with duplicate name (BZ 575737). + * Fri Mar 26 2010 Dennis Gilmore - 7.0.1-35.1 - dont apply gdb-bz539590-gnu-ifunc.patch on sparc - we dont yet have the support in glibc