OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check 64-bit relocation addend overflow for x32

Browse Source 
bfd/

	* elf64-x86-64.c (elf_x86_64_relocate_section): Check addend
	overflow for R_X86_64_RELATIVE64.

gas/

	* config/tc-i386.c (tc_gen_reloc): Check x32 addend overflow
	for BFD_RELOC_64.

gas/testsuite/

	* gas/i386/ilp32/ilp32.exp: Run reloc64-inval.

	* gas/i386/ilp32/reloc64.s: Add tests for ".quad".
	* gas/i386/ilp32/reloc64.d: Updated.

	* gas/i386/ilp32/reloc64-inval.l: New file.
	* gas/i386/ilp32/reloc64-inval.s: Likewise.

ld/testsuite/

	* ld-x86-64/ilp32-11.d: New file.
	* ld-x86-64/ilp32-11.s: Likewise.

	* ld-x86-64/x86-64.exp: Run ilp32-11.
This commit is contained in:
H.J. Lu 2012-05-10 03:25:17 +00:00
parent 968bf8f19d
commit 8cf0d2dd21
14 changed files with 87 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2012-05-09 H.J. Lu <hongjiu.lu@intel.com>
* elf64-x86-64.c (elf_x86_64_relocate_section): Check addend
overflow for R_X86_64_RELATIVE64.
2012-05-08 Ben Cheng <bccheng@google.com>
* bfd/elf.c: Preserve the original p_align and p_flags if they are

21
bfd/elf64-x86-64.c
View File

@ -3681,6 +3681,27 @@ elf_x86_64_relocate_section (bfd *output_bfd,
outrel.r_info = htab->r_info (0,
R_X86_64_RELATIVE64);
outrel.r_addend = relocation + rel->r_addend;
/* Check addend overflow. */
if ((outrel.r_addend & 0x80000000)
!= (rel->r_addend & 0x80000000))
{
const char *name;
if (h && h->root.root.string)
name = h->root.root.string;
else
name = bfd_elf_sym_name (input_bfd, symtab_hdr,
sym, NULL);
(*_bfd_error_handler)
(_("%B: addend %ld in relocation %s against "
"symbol `%s' at 0x%lx in section `%A' is "
"out of range"),
input_bfd, input_section,
(long) rel->r_addend,
x86_64_elf_howto_table[r_type].name,
name, (unsigned long) rel->r_offset);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
}
else
{

5
gas/ChangeLog
View File

@ -1,3 +1,8 @@
2012-05-09 H.J. Lu <hongjiu.lu@intel.com>
* config/tc-i386.c (tc_gen_reloc): Check x32 addend overflow
for BFD_RELOC_64.
2012-05-08 Alan Modra <amodra@gmail.com>
* Makefile.am (check_DEJAGNU): Export LC_ALL=C in place of other

11
gas/config/tc-i386.c
View File

@ -9173,6 +9173,17 @@ tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixp)
if (disallow_64bit_reloc)
switch (code)
{
case BFD_RELOC_64:
/* Check addend overflow. */
if ((long long) fixp->fx_offset > 0x7fffffffLL
|| (long long) fixp->fx_offset < -0x80000000LL)
{
as_bad_where (fixp->fx_file, fixp->fx_line,
_("cannot represent relocation %s with addend %lld in x32 mode"),
bfd_get_reloc_code_name (code),
(long long) fixp->fx_offset);
}
break;
case BFD_RELOC_X86_64_DTPOFF64:
case BFD_RELOC_X86_64_TPOFF64:
case BFD_RELOC_64_PCREL:

10
gas/testsuite/ChangeLog
View File

@ -1,3 +1,13 @@
2012-05-09 H.J. Lu <hongjiu.lu@intel.com>
* gas/i386/ilp32/ilp32.exp: Run reloc64-inval.
* gas/i386/ilp32/reloc64.s: Add tests for ".quad".
* gas/i386/ilp32/reloc64.d: Updated.
* gas/i386/ilp32/reloc64-inval.l: New file.
* gas/i386/ilp32/reloc64-inval.s: Likewise.
2012-05-08 Alan Modra <amodra@gmail.com>
* lib/gas-defs.exp (run_dump_test): Don't set LC_ALL here.

1
gas/testsuite/gas/i386/ilp32/ilp32.exp
View File

@ -26,6 +26,7 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] &&
}
run_list_test "reloc64" "--defsym _bad_=1"
run_list_test "reloc64-inval"
set ASFLAGS "$old_ASFLAGS"
}

3
gas/testsuite/gas/i386/ilp32/reloc64-inval.l Normal file
View File

@ -0,0 +1,3 @@
.*: Assembler messages:
.*:2: Error: .*
.*:3: Error: .*

3
gas/testsuite/gas/i386/ilp32/reloc64-inval.s Normal file
View File

@ -0,0 +1,3 @@
.data
.quad xtrn + 0x80000000
.quad xtrn - 0x80000001

3
gas/testsuite/gas/i386/ilp32/reloc64.d
View File

@ -90,3 +90,6 @@ Disassembly of section \.data:
.*[ ]+R_X86_64_PC16[ ]+xtrn
.*[ ]+R_X86_64_8[ ]+xtrn
.*[ ]+R_X86_64_PC8[ ]+xtrn
.*[ ]+R_X86_64_64[ ]+xtrn
.*[ ]+R_X86_64_64[ ]+xtrn\+0x7fffffff
.*[ ]+R_X86_64_64[ ]+xtrn\+0x80000000

5
gas/testsuite/gas/i386/ilp32/reloc64.s
View File

@ -178,3 +178,8 @@ bad .byte xtrn@tpoff
.text
mov xtrn@tpoff (%rbx), %eax
.data
.quad xtrn
.quad xtrn + 0x7fffffff
.quad xtrn - 0x80000000

7
ld/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2012-05-09 H.J. Lu <hongjiu.lu@intel.com>
* ld-x86-64/ilp32-11.d: New file.
* ld-x86-64/ilp32-11.s: Likewise.
* ld-x86-64/x86-64.exp: Run ilp32-11.
2012-05-05 H.J. Lu <hongjiu.lu@intel.com>
PR ld/14052

3
ld/testsuite/ld-x86-64/ilp32-11.d Normal file
View File

@ -0,0 +1,3 @@
#as: --x32
#ld: -shared -melf32_x86_64
#error: .*addend 2147483647 in relocation R_X86_64_64 against symbol `.text' at 0x0 in section `.data.rel.local' is out of range

9
ld/testsuite/ld-x86-64/ilp32-11.s Normal file
View File

@ -0,0 +1,9 @@
.section .data.rel.local,"aw",@progbits
.align 8
.Ljmp:
.quad func + 0x7fffffff
.text
.type func, @function
func:
ret

1
ld/testsuite/ld-x86-64/x86-64.exp
View File

@ -253,6 +253,7 @@ run_dump_test "ilp32-7"
run_dump_test "ilp32-8"
run_dump_test "ilp32-9"
run_dump_test "ilp32-10"
run_dump_test "ilp32-11"
run_dump_test "ia32-1"
run_dump_test "ia32-2"
run_dump_test "ia32-3"