From f9fc50c3eced243c0648fb0fbfe2c9877c25e1e4 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 29 Jul 2015 17:51:27 +0200 Subject: [PATCH] unstrip: Handle debuginfo files with missing SHF_INFO_LINK section flags. With GCC 5 there might be a .rela.plt section with SHF_INFO_LINK set. Buggy binutils objdump might strip it from the section in the debug file. Ignore such differences for relocation sections and put the flag back if necessary. Also improve the error message a little by only discarding the already matched sections if there is an prelink undo section. Otherwise we will report all sections as not matching if the file wasn't prelinked instead of just the non-matching sections. New testfiles generated by gcc5 and binutils objdump added. Signed-off-by: Mark Wielaard --- src/ChangeLog | 9 +++++++ src/unstrip.c | 34 +++++++++++++++++++++---- tests/ChangeLog | 10 ++++++++ tests/Makefile.am | 8 ++++-- tests/run-unstrip-test3.sh | 17 +++++++++++++ tests/testfile-info-link.bz2 | Bin 0 -> 2768 bytes tests/testfile-info-link.debuginfo.bz2 | Bin 0 -> 1844 bytes tests/testfile-info-link.stripped.bz2 | Bin 0 -> 2422 bytes 8 files changed, 71 insertions(+), 7 deletions(-) create mode 100755 tests/run-unstrip-test3.sh create mode 100755 tests/testfile-info-link.bz2 create mode 100755 tests/testfile-info-link.debuginfo.bz2 create mode 100755 tests/testfile-info-link.stripped.bz2 diff --git a/src/ChangeLog b/src/ChangeLog index 632330c9f..a0c32fa24 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2015-07-29 Mark Wielaard + + * unstrip.c (sections_flags_match): New function. + (sections_match): Use sections_flags_match. + (find_alloc_sections_prelink): Only clear matched sections if there + is an undo section. + (copy_elided_sections): Add SHF_INFO_LINK to shdr_mem.sh_flags if + necessary. + 2015-06-27 Pino Toscano * src/strings.c: Define MAP_POPULATE if not defined already. diff --git a/src/unstrip.c b/src/unstrip.c index 4a8e5fa9c..883309460 100644 --- a/src/unstrip.c +++ b/src/unstrip.c @@ -867,12 +867,28 @@ compare_symbols_output (const void *a, const void *b) #undef CMP +/* Return true if the flags of the sections match, ignoring the SHF_INFO_LINK + flag if the section contains relocation information. */ +static bool +sections_flags_match (Elf64_Xword sh_flags1, Elf64_Xword sh_flags2, + Elf64_Word sh_type) +{ + if (sh_type == SHT_REL || sh_type == SHT_RELA) + { + sh_flags1 &= ~SHF_INFO_LINK; + sh_flags2 &= ~SHF_INFO_LINK; + } + + return sh_flags1 == sh_flags2; +} + /* Return true iff the flags, size, and name match. */ static bool sections_match (const struct section *sections, size_t i, const GElf_Shdr *shdr, const char *name) { - return (sections[i].shdr.sh_flags == shdr->sh_flags + return (sections_flags_match (sections[i].shdr.sh_flags, shdr->sh_flags, + sections[i].shdr.sh_type) && (sections[i].shdr.sh_size == shdr->sh_size || (sections[i].shdr.sh_size < shdr->sh_size && section_can_shrink (§ions[i].shdr))) @@ -930,10 +946,6 @@ find_alloc_sections_prelink (Elf *debug, Elf_Data *debug_shstrtab, struct section *sections, size_t nalloc, size_t nsections) { - /* Clear assignments that might have been bogus. */ - for (size_t i = 0; i < nalloc; ++i) - sections[i].outscn = NULL; - Elf_Scn *undo = NULL; for (size_t i = nalloc; i < nsections; ++i) { @@ -952,6 +964,10 @@ find_alloc_sections_prelink (Elf *debug, Elf_Data *debug_shstrtab, size_t undo_nalloc = 0; if (undo != NULL) { + /* Clear assignments that might have been bogus. */ + for (size_t i = 0; i < nalloc; ++i) + sections[i].outscn = NULL; + Elf_Data *undodata = elf_rawdata (undo, NULL); ELF_CHECK (undodata != NULL, _("cannot read '.gnu.prelink_undo' section: %s")); @@ -1500,6 +1516,14 @@ more sections in stripped file than debug file -- arguments reversed?")); shdr_mem.sh_size = sec->shdr.sh_size; shdr_mem.sh_info = sec->shdr.sh_info; shdr_mem.sh_link = sec->shdr.sh_link; + + /* Buggy binutils objdump might have stripped the SHF_INFO_LINK + put it back if necessary. */ + if ((sec->shdr.sh_type == SHT_REL || sec->shdr.sh_type == SHT_RELA) + && sec->shdr.sh_flags != shdr_mem.sh_flags + && (sec->shdr.sh_flags & SHF_INFO_LINK) != 0) + shdr_mem.sh_flags |= SHF_INFO_LINK; + if (sec->shdr.sh_link != SHN_UNDEF) shdr_mem.sh_link = ndx_section[sec->shdr.sh_link - 1]; if (shdr_mem.sh_flags & SHF_INFO_LINK) diff --git a/tests/ChangeLog b/tests/ChangeLog index 90b9a0a1c..109a30568 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,13 @@ +2015-07-29 Mark Wielaard + + * run-unstrip-test3.sh: New test. + * testfile-info-link.bz2: New file. + * testfile-info-link.debuginfo.bz2: Likewise. + * testfile-info-link.stripped.bz2: Likewise. + * Makefile.am (TESTS): Add run-unstrip-test3.sh. + (EXTRA_DIST): Add run-unstrip-test3.sh, testfile-info-link.bz2, + testfile-info-link.debuginfo.bz2, testfile-info-link.stripped.bz2. + 2015-06-27 Pino Toscano * tests/run-deleted.sh: Skip when detecting a not implemented diff --git a/tests/Makefile.am b/tests/Makefile.am index 55241c7d1..62e7b7c48 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -78,7 +78,8 @@ TESTS = run-arextract.sh run-arsymtest.sh newfile test-nlist \ run-strip-test6.sh run-strip-test7.sh run-strip-test8.sh \ run-strip-test9.sh run-strip-test10.sh \ run-strip-groups.sh run-strip-reloc.sh \ - run-unstrip-test.sh run-unstrip-test2.sh run-unstrip-M.sh \ + run-unstrip-test.sh run-unstrip-test2.sh \ + run-unstrip-test3.sh run-unstrip-M.sh \ run-ecp-test.sh run-ecp-test2.sh run-alldts.sh \ run-elflint-test.sh run-elflint-self.sh run-ranlib-test.sh \ run-ranlib-test2.sh run-ranlib-test3.sh run-ranlib-test4.sh \ @@ -161,7 +162,10 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh \ run-strip-test9.sh run-strip-test10.sh \ run-strip-reloc.sh hello_i386.ko.bz2 hello_x86_64.ko.bz2 \ hello_ppc64.ko.bz2 hello_s390.ko.bz2 hello_aarch64.ko.bz2 \ - run-unstrip-test.sh run-unstrip-test2.sh run-unstrip-M.sh\ + run-unstrip-test.sh run-unstrip-test2.sh \ + testfile-info-link.bz2 testfile-info-link.debuginfo.bz2 \ + testfile-info-link.stripped.bz2 run-unstrip-test3.sh \ + run-unstrip-M.sh \ run-elflint-self.sh run-ranlib-test.sh run-ranlib-test2.sh \ run-ranlib-test3.sh run-ranlib-test4.sh \ run-addrscopes.sh run-strings-test.sh run-funcscopes.sh \ diff --git a/tests/run-unstrip-test3.sh b/tests/run-unstrip-test3.sh new file mode 100755 index 000000000..5459e72de --- /dev/null +++ b/tests/run-unstrip-test3.sh @@ -0,0 +1,17 @@ +# Buggy binutils objdump might strip SHF_INFO_LINK from relocation sections. +# With gcc5 we might have a .rela.plt section with that flag set. +# +# int main() +# { +# return 0; +# } +# +# gcc -o testfile-info-link -g testprog.c +# objcopy --only-keep-debug testfile-info-link testfile-info-link.debuginfo +# eu-strip --strip-debug -o testfile-info-link.stripped testfile-info-link + +original=testfile-info-link +stripped=testfile-info-link.stripped +debugfile=testfile-info-link.debuginfo + +. $srcdir/run-unstrip-test.sh diff --git a/tests/testfile-info-link.bz2 b/tests/testfile-info-link.bz2 new file mode 100755 index 0000000000000000000000000000000000000000..073b761433550d72635dfd6462e23faf76e294d6 GIT binary patch literal 2768 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 Wo7m#F-gF@U#oUoj6eI|5GTwmC!sK88 literal 0 Hc-jL100001 diff --git a/tests/testfile-info-link.debuginfo.bz2 b/tests/testfile-info-link.debuginfo.bz2 new file mode 100755 index 0000000000000000000000000000000000000000..3225d19fef5123667089b509e1f91882bba852e2 GIT binary patch literal 1844 zc-jFp2g~?ET4*^jL0KkKSB4SZXlt42E42;P| zOf*&eD%V|THeAV(DZz09o`IG*49rYT$!bYU6uE-rN^}#;kPjEYRpFQch+ru(aU(-4 z=Lf76RQ%;#8z~*aaJ$IyFe)T}df?EFvSX6^Mq6{?)8VXl$m3wJ6uAg?-9r&$ew9s9jZ% zC!D$QB{FQ#Ds=yLHY-DRGI3I*fdPGqxPJKe3F zc^lMjzm_t4`4T_+P5}lDlR=RJp$2Tk(JUKDa!euqDBd&b=Og%GN4}~9U2@_surTpr zhW8&Lh}pA`rwJKs8xgQ#GK`gnD}_Ror78uuc;9}qL}ou@W`STtq<(C~$Gd?BPqVN7=uBjykY}Zk)H?s z>T&Xl``b4XHba*%;wD|g3kfwVX;9!t(3!U^ensg02Anb5gLW06U2}z7X}id5a`_kDw96SCZ}_z>=ej60OpE2+5Y>)-!&7#RH|sHirPX_ajs2w)EHX4 zUn0|jWHE3vi%R()BD}}lmdfb+NW>~QN{7BhS=QFItyvt-%-y!faNGC0%AED=&4{Qu zg)amQhM~nGN@QxHy6R(Z)3S(ZQh-e~ls1pyRII;ZraSpN541t>*w@YrY-Jd7ySgUj zB?YzPY;U*;_+w{ol;`!!%Q4QWF-%IF^^o7{J#*9QV zn*%`tdG-w)S7$WLOdjAd(ox5Tjdr0?isSaS>|w3*mm) zvZ0E!sdGrsMMOloGYhJWVLnzGs5AIjsw>h^9gE)U+(z10ZE7^ct4)oT2O!2mO)XR& z8;4y=L}O7?8X9;}^fJ(-Qs){dVH7ASX4HlU4oT9?{XWvUin3c&qoLKkB!=o*h)F3D z&7+4oay|%6GFx2BY)p~CY70`Tr#i}vh*pWL>+G3n#Az&%yM19YCFG!O@tMhAmb~hj zm6?j!Okg#$MheRbHcuR*T%eZ_81+(s%Z${_Rd{P;DKNk;Fd2zth7tiqOv!}|A#EZn zol4MUW80{WXqg5KM5LORI5A9Z>l$2HG1Y;M3Q?BbMOBV$Sz7F2YpVrb3s&n0z5uO3 zOY+=_vWpWN5U!c6m)u@O5+zKjpu+3XATl{|74wxGjd?J)gLGtJ#4#ASO9N^B?4jSk z803`K%b0I{YE>~&l!B^KxT?xm*Z;NGLsEuP_Pxr}yZ0vdzHwD+hHx9R20n(valqM+ iY=pp!CWon@GH7T638T_I zOpKZh0i!_EKmgN5Y6B*K1JnkZ8Z-k#O*9Qn2$-5^X^>O&NtrQB)X}v8pfmu`G-v<- z007Vdri}mq^#B0S0001J4G<V6dR1;2EFT1r(4DTW1Sx}|sG$iSaPCHmrRg0)Yr=3SD zA3+OS4LV$x@N>a%M^7o~gsidxrS)PUAP4S;Cmcxy8bF4KB(Wm0!mc|CfmVkJ572Ou zxyDag>ajN+g;y4uvJ>d3vx{D7DJ+0`h;bnZNuor1Rk1PfO(s5rA4|bc#@=h|_sF*o zISOe&nL=~^3T`k5!~_Z_VoC@~NmOgXa*i2-#5V>I3Bo5A7U;Xxb`^ttzM1uXUW^Dz z7nZpz{3|!)L;$RM{$$W0oV&%TVb$05oPYsmmu|_=7^AB3XW1YK71aaV=hY4aU;*Xb zBqRzGp9$R7pa`nR9C}p%&ALp?8idTv{w@MwqTQ7Sf!^}dY$t@PQ-Mr}L#ah71%iol zv_7RuGe)jj&E9!0+GCJpUHHf%1hJ3=LY&BfB_z-#GTQ`ziVVRH36A#B1VRb}7Nrc@= zqTM$Wh_YU%D|C??Ss9Im%2&B`4G!g`Bs%$DS>0Qgw6hVGvJl=|LVpKgGb4t#@|-v5fqh{d&avS(Q{$Haix8HI=Cga9NTr64k7D44yj!T3~1 zi93w;LHk}>N5YJYbdyNBv?z@V?Rg-BYQWL47crooV7*!n&Z`#_XDV!z?nDso7gKH* zJ2|@Hq{eDIv@>x?WS9$fEVY)kDN0h5zCV6}iZgavT|Q2FhHTUrYgd}U&dki)u0Ew| z(L|Lg=)UZ4^^9`d<+*GxHG&8LEDRKL1sVkT1t{)j0zrbAts=F(?q7M~Eqn0+gi2R=0=rq}N4VL>>~%CWT>21+h9RRjf`}LE=dW0}i+Y0v57B z3IRw;06g|d3#i_Tzu8w-I3P9$XHq~EMo<}Fn5dMkBwTio6lS#z1ckl}A&nujq~Gv zv0^dMT!$#S{~U)j^usg*)q)zWX4cL4X3oVFzh!EG-p@P=bcfAz9l@`Y5*kKpu9!_) zYHCi~`+pZhd*R)^-AeQ@Y%|R%LdfX_4jK-DggQ`WCW667wA3umdfka6(yO8Y0e+3Y ziad3$-0y6X!qjUq023CCT`iYDwIdlqFi?S|q~J;69LfYb^mCGjBT}-ZKsORtd@I1d z%9_BS5tX-E*dkh;U5xus>tOM>~r&|yj2 zR`v9>lN|Q^|aC@4}hwoDwa_)mvH2oq$_UW=!JuFb3%!qE*s?BAtWoo z>BoY4JnwtZb{7#@;xhZp>4ZXfE=a$sG50Dn67IuB|g-%F<{j2gktjt28}Sn5bijcB!n}&J0Y|gg<{KH6BuH? z+Y-1}znmI&2dAUkF)={d#?@nIM8q2D)FQhOJ+1e5A}6(;S}Tnc0lyL)<2E%SGa&F5 z>IonwhJ=+JBAkf;d>BY!g|T#5B{c}Du{Qjd-MM&Wl<#J^k%W#T8vXVp6OGc*Z7eNj zsfD0o1Yo4n%ZR4TAp|C7M%YDB2ndwXC|xYy7;Q(T8Y=;Axlqd}FXm&HsuqIs#J*M@ znS}QlGJFz=1c9)LiJ=q&;$$;lFAEIMm_-GGL2#;K6kyL}VonF=^76<|0q{yoO~pWo z0Z0%KKtdof8j0|UrpF`@YDi1~VBv!8%~_ZMC{@}iIw3Rx%5_Vhqf)VLb%Nj`7)B<3 z^9Hq*265Q6UggsHFic=Qto=LXgFsGS#Ht^*sawO(LJdlg(1LJ>Nyp+VpyoM55WrY{ zt{_z5+L2s);yzhagMmcMz9o?zaiUY1n1g!@W!!Zt&n;$rRy2LW4dN*q&QO82|tP literal 0 Hc-jL100001 -- 2.47.2