bfd: don't silently wrap or truncate PE image section RVAs
In PE images section addresses get expressed as addresses relative to
the image base. Therefore the VA of a section must be no less than the
image base, and after subtraction of the image base the resulting value
should fit in 32 bits. (The issue is particularly obvious to notice when
sections, perhaps because of ELF assumptions, get placed at VA 0 by
default. Debugging info sections as well as .comment, when input files
are ELF, are a good example. All such sections need proper mentioning in
the linker script to avoid this warning.)
There are a number of test cases which previously produced bogus images,
yet still declared the test a success. Like done for other tests
already, force a zero image base for these. This then also allows (and
requires) dropping again xfail-s which 39a7b38fac
("Fix linker tests
to work with 16-bit targets") had added to ld-scripts/default-script*.d
(originally as skip-s). This also depends on similar adjustments to
testsuite/ld-scripts/map-address.* made by an earlier patch.
For ld-scripts/print-memory-usage.* I suppose xcoff could be dropped
from the exclusion list by suppressing garbage collection, just like
already done in e.g. (as seen in the diff here) ld-scripts/data.*, but I
didn't want to make unrelated adjustments.
This commit is contained in:
parent
500e7d4cb3
commit
87fa7d568d
@ -1,3 +1,7 @@
|
|||||||
|
2021-03-09 Jan Beulich <jbeulich@suse.com>
|
||||||
|
|
||||||
|
* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Diagnose out of range RVA.
|
||||||
|
|
||||||
2021-03-05 H.J. Lu <hongjiu.lu@intel.com>
|
2021-03-05 H.J. Lu <hongjiu.lu@intel.com>
|
||||||
|
|
||||||
PR ld/27425
|
PR ld/27425
|
||||||
|
@ -933,11 +933,13 @@ _bfd_XXi_swap_scnhdr_out (bfd * abfd, void * in, void * out)
|
|||||||
|
|
||||||
memcpy (scnhdr_ext->s_name, scnhdr_int->s_name, sizeof (scnhdr_int->s_name));
|
memcpy (scnhdr_ext->s_name, scnhdr_int->s_name, sizeof (scnhdr_int->s_name));
|
||||||
|
|
||||||
PUT_SCNHDR_VADDR (abfd,
|
ss = scnhdr_int->s_vaddr - pe_data (abfd)->pe_opthdr.ImageBase;
|
||||||
((scnhdr_int->s_vaddr
|
if (scnhdr_int->s_vaddr < pe_data (abfd)->pe_opthdr.ImageBase)
|
||||||
- pe_data (abfd)->pe_opthdr.ImageBase)
|
_bfd_error_handler ("%pB:%.8s: section below image base",
|
||||||
& 0xffffffff),
|
abfd, scnhdr_int->s_name);
|
||||||
scnhdr_ext->s_vaddr);
|
else if(ss != (ss & 0xffffffff))
|
||||||
|
_bfd_error_handler ("%pB:%.8s: RVA truncated", abfd, scnhdr_int->s_name);
|
||||||
|
PUT_SCNHDR_VADDR (abfd, ss & 0xffffffff, scnhdr_ext->s_vaddr);
|
||||||
|
|
||||||
/* NT wants the size data to be rounded up to the next
|
/* NT wants the size data to be rounded up to the next
|
||||||
NT_FILE_ALIGNMENT, but zero if it has no content (as in .bss,
|
NT_FILE_ALIGNMENT, but zero if it has no content (as in .bss,
|
||||||
|
15
ld/ChangeLog
15
ld/ChangeLog
@ -1,3 +1,18 @@
|
|||||||
|
2021-03-09 Jan Beulich <jbeulich@suse.com>
|
||||||
|
|
||||||
|
* testsuite/ld-scripts/alignof.exp,
|
||||||
|
testsuite/ld-scripts/data.exp,
|
||||||
|
testsuite/ld-scripts/default-script.exp,
|
||||||
|
testsuite/ld-scripts/log2.exp,
|
||||||
|
testsuite/ld-scripts/print-memory-usage.exp,
|
||||||
|
testsuite/ld-scripts/sizeof.exp,
|
||||||
|
testsuite/ld-undefined/weak-undef.exp: Set image base to zero
|
||||||
|
for PE/COFF.
|
||||||
|
* testsuite/ld-scripts/default-script1.d,
|
||||||
|
testsuite/ld-scripts/default-script2.d,
|
||||||
|
testsuite/ld-scripts/default-script3.d,
|
||||||
|
testsuite/ld-scripts/default-script4.d: Drop xfail and comment.
|
||||||
|
|
||||||
2021-03-05 H.J. Lu <hongjiu.lu@intel.com>
|
2021-03-05 H.J. Lu <hongjiu.lu@intel.com>
|
||||||
|
|
||||||
PR ld/27425
|
PR ld/27425
|
||||||
|
@ -32,7 +32,14 @@ if ![ld_assemble $as $srcdir/$subdir/alignof.s tmpdir/alignof.o] {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if ![ld_link $ld tmpdir/alignof "-T $srcdir/$subdir/alignof.t tmpdir/alignof.o"] {
|
if { [is_pecoff_format] } {
|
||||||
|
set IMAGE_BASE "--image-base 0"
|
||||||
|
} else {
|
||||||
|
set IMAGE_BASE ""
|
||||||
|
}
|
||||||
|
|
||||||
|
if ![ld_link $ld tmpdir/alignof "-T $srcdir/$subdir/alignof.t \
|
||||||
|
$IMAGE_BASE tmpdir/alignof.o"] {
|
||||||
fail $testname
|
fail $testname
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -20,7 +20,9 @@
|
|||||||
# MA 02110-1301, USA.
|
# MA 02110-1301, USA.
|
||||||
|
|
||||||
set old_LDFLAGS $LDFLAGS
|
set old_LDFLAGS $LDFLAGS
|
||||||
if { [is_xcoff_format] } then {
|
if { [is_pecoff_format] } then {
|
||||||
|
set LDFLAGS "$LDFLAGS --image-base 0"
|
||||||
|
} elseif { [is_xcoff_format] } then {
|
||||||
set LDFLAGS "$LDFLAGS -bnogc"
|
set LDFLAGS "$LDFLAGS -bnogc"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -21,6 +21,8 @@
|
|||||||
set old_ldflags $LDFLAGS
|
set old_ldflags $LDFLAGS
|
||||||
if { [istarget spu*-*-*] } {
|
if { [istarget spu*-*-*] } {
|
||||||
set LDFLAGS "$LDFLAGS --local-store 0:0"
|
set LDFLAGS "$LDFLAGS --local-store 0:0"
|
||||||
|
} elseif { [is_pecoff_format] } {
|
||||||
|
set LDFLAGS "$LDFLAGS --image-base 0"
|
||||||
} elseif { [is_xcoff_format] } {
|
} elseif { [is_xcoff_format] } {
|
||||||
set LDFLAGS "$LDFLAGS -bnogc"
|
set LDFLAGS "$LDFLAGS -bnogc"
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
#source: default-script.s
|
#source: default-script.s
|
||||||
#ld: -defsym _START=0x800 -T default-script.t
|
#ld: -defsym _START=0x800 -T default-script.t
|
||||||
#nm: -n
|
#nm: -n
|
||||||
#xfail: {[is_pecoff_format x86_64-*]}
|
|
||||||
# Skipped on Mingw64 and Cygwin because the image base defaults to 0x100000000
|
|
||||||
|
|
||||||
#...
|
#...
|
||||||
0*800 . _START
|
0*800 . _START
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
#source: default-script.s
|
#source: default-script.s
|
||||||
#ld: -T default-script.t -defsym _START=0x800
|
#ld: -T default-script.t -defsym _START=0x800
|
||||||
#nm: -n
|
#nm: -n
|
||||||
#xfail: {[is_pecoff_format x86_64-*]}
|
|
||||||
# Skipped on Mingw64 and Cygwin because the image base defaults to 0x100000000
|
|
||||||
|
|
||||||
#...
|
#...
|
||||||
0*800 . _START
|
0*800 . _START
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
#source: default-script.s
|
#source: default-script.s
|
||||||
#ld: -defsym _START=0x800 -dT default-script.t
|
#ld: -defsym _START=0x800 -dT default-script.t
|
||||||
#nm: -n
|
#nm: -n
|
||||||
#xfail: {[is_pecoff_format x86_64-*]}
|
|
||||||
# Skipped on Mingw64 and Cygwin because the image base defaults to 0x100000000
|
|
||||||
|
|
||||||
#...
|
#...
|
||||||
0*800 . _START
|
0*800 . _START
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
#source: default-script.s
|
#source: default-script.s
|
||||||
#ld: --default-script default-script.t -defsym _START=0x800
|
#ld: --default-script default-script.t -defsym _START=0x800
|
||||||
#nm: -n
|
#nm: -n
|
||||||
#xfail: {[is_pecoff_format x86_64-*]}
|
|
||||||
# Skipped on Mingw64 and Cygwin because the image base defaults to 0x100000000
|
|
||||||
|
|
||||||
#...
|
#...
|
||||||
0*800 . _START
|
0*800 . _START
|
||||||
|
@ -26,7 +26,14 @@ if {![ld_assemble $as $srcdir/$subdir/log2.s tmpdir/log2.o]} {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if {![ld_link $ld tmpdir/log2 "$LDFLAGS -T $srcdir/$subdir/log2.t tmpdir/log2.o"]} {
|
if { [is_pecoff_format] } {
|
||||||
|
set IMAGE_BASE "--image-base 0"
|
||||||
|
} else {
|
||||||
|
set IMAGE_BASE ""
|
||||||
|
}
|
||||||
|
|
||||||
|
if {![ld_link $ld tmpdir/log2 "$LDFLAGS -T $srcdir/$subdir/log2.t \
|
||||||
|
$IMAGE_BASE tmpdir/log2.o"]} {
|
||||||
fail $testname
|
fail $testname
|
||||||
} else {
|
} else {
|
||||||
pass $testname
|
pass $testname
|
||||||
|
@ -33,6 +33,11 @@ if { [istarget mips*-*-*]
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
set old_LDFLAGS $LDFLAGS
|
||||||
|
if { [is_pecoff_format] } {
|
||||||
|
set LDFLAGS "$LDFLAGS --image-base 0"
|
||||||
|
}
|
||||||
|
|
||||||
run_ld_link_tests {
|
run_ld_link_tests {
|
||||||
{
|
{
|
||||||
"print-memory-usage-1"
|
"print-memory-usage-1"
|
||||||
@ -66,3 +71,4 @@ run_ld_link_tests {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
set LDFLAGS $old_LDFLAGS
|
||||||
|
@ -27,7 +27,14 @@ if ![ld_assemble $as $srcdir/$subdir/sizeof.s tmpdir/sizeof.o] {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if ![ld_link $ld tmpdir/sizeof "$LDFLAGS -T $srcdir/$subdir/sizeof.t tmpdir/sizeof.o"] {
|
if { [is_pecoff_format] } {
|
||||||
|
set IMAGE_BASE "--image-base 0"
|
||||||
|
} else {
|
||||||
|
set IMAGE_BASE ""
|
||||||
|
}
|
||||||
|
|
||||||
|
if ![ld_link $ld tmpdir/sizeof "$LDFLAGS -T $srcdir/$subdir/sizeof.t \
|
||||||
|
$IMAGE_BASE tmpdir/sizeof.o"] {
|
||||||
fail $testname
|
fail $testname
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -23,14 +23,20 @@
|
|||||||
# some a.out targets too.
|
# some a.out targets too.
|
||||||
set testname "weak undefined data symbols"
|
set testname "weak undefined data symbols"
|
||||||
|
|
||||||
|
if { [is_pecoff_format] } then {
|
||||||
|
set IMAGE_BASE "--image-base 0"
|
||||||
|
} else {
|
||||||
|
set IMAGE_BASE ""
|
||||||
|
}
|
||||||
|
|
||||||
if { ![is_elf_format] && ![is_pecoff_format] } then {
|
if { ![is_elf_format] && ![is_pecoff_format] } then {
|
||||||
unsupported $testname
|
unsupported $testname
|
||||||
} elseif {![ld_assemble $as $srcdir/$subdir/weak-undef.s \
|
} elseif {![ld_assemble $as $srcdir/$subdir/weak-undef.s \
|
||||||
tmpdir/weak-undef.o]} then {
|
tmpdir/weak-undef.o]} then {
|
||||||
# It's OK if .weak doesn't work on this target.
|
# It's OK if .weak doesn't work on this target.
|
||||||
unsupported $testname
|
unsupported $testname
|
||||||
} elseif {![ld_link $ld tmpdir/weak-undef \
|
} elseif {![ld_link $ld tmpdir/weak-undef "tmpdir/weak-undef.o \
|
||||||
"tmpdir/weak-undef.o -T $srcdir/$subdir/weak-undef.t"]} then {
|
-T $srcdir/$subdir/weak-undef.t $IMAGE_BASE"]} then {
|
||||||
# Weak symbols are broken for non-i386 PE targets.
|
# Weak symbols are broken for non-i386 PE targets.
|
||||||
if {! [istarget i?86-*-*]} {
|
if {! [istarget i?86-*-*]} {
|
||||||
setup_xfail *-*-pe*
|
setup_xfail *-*-pe*
|
||||||
|
Loading…
Reference in New Issue
Block a user