From 3d9499950a94df8577fa01ba98ec0d58f07fd9c0 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 10 Apr 2015 14:02:23 -0700 Subject: [PATCH] Check GOTOFF reloc against protected data on x86 R_386_GOTOFF/R_X86_64_GOTOFF64 relocation shouldn't be used against protected data symbol on x86 since with copy relocation, address of protected data defined in the shared library may be external. This patch will break building shared libraries with protected data symbols using GCCs older than GCC 5 without the bug fix for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65248 GCC backport request should be made in the GCC bug report above. bfd/ PR ld/pr17709 * elf32-i386.c (elf_i386_relocate_section): Also check R_386_GOTOFF against protected data symbol when building shared library. * elf64-x86-64.c (elf_x86_64_relocate_section): Also check R_X86_64_GOTOFF64 against protected data symbol when building shared library. ld/testsuite/ PR ld/pr17709 * ld-i386/protected6.d: New file. * ld-i386/protected6.s: Likewise. * ld-x86-64/protected6.d: Likewise. * ld-x86-64/protected6.s: Likewise. * ld-x86-64/protected7.d: Likewise. * ld-x86-64/protected7.s: Likewise. * ld-x86-64/protected7a.d: Likewise. * ld-x86-64/protected7b.d: Likewise. --- bfd/ChangeLog | 9 +++++++++ bfd/elf32-i386.c | 17 ++++++++++------- bfd/elf64-x86-64.c | 15 +++++++++------ ld/testsuite/ChangeLog | 12 ++++++++++++ ld/testsuite/ld-i386/i386.exp | 1 + ld/testsuite/ld-i386/protected6.d | 3 +++ ld/testsuite/ld-i386/protected6.s | 14 ++++++++++++++ ld/testsuite/ld-x86-64/protected6.d | 3 +++ ld/testsuite/ld-x86-64/protected6.s | 14 ++++++++++++++ ld/testsuite/ld-x86-64/protected7.s | 12 ++++++++++++ ld/testsuite/ld-x86-64/protected7a.d | 4 ++++ ld/testsuite/ld-x86-64/protected7b.d | 6 ++++++ ld/testsuite/ld-x86-64/x86-64.exp | 3 +++ 13 files changed, 100 insertions(+), 13 deletions(-) create mode 100644 ld/testsuite/ld-i386/protected6.d create mode 100644 ld/testsuite/ld-i386/protected6.s create mode 100644 ld/testsuite/ld-x86-64/protected6.d create mode 100644 ld/testsuite/ld-x86-64/protected6.s create mode 100644 ld/testsuite/ld-x86-64/protected7.s create mode 100644 ld/testsuite/ld-x86-64/protected7a.d create mode 100644 ld/testsuite/ld-x86-64/protected7b.d diff --git a/bfd/ChangeLog b/bfd/ChangeLog index dd30698780..ea3543552a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,12 @@ +2015-04-10 H.J. Lu + + PR ld/pr17709 + * elf32-i386.c (elf_i386_relocate_section): Also check R_386_GOTOFF + against protected data symbol when building shared library. + * elf64-x86-64.c (elf_x86_64_relocate_section): Also check + R_X86_64_GOTOFF64 against protected data symbol when building + shared library. + 2015-04-10 H.J. Lu PR ld/pr15228 diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 52f4d3343c..af16da357d 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -3714,10 +3714,10 @@ elf_i386_relocate_section (bfd *output_bfd, /* Relocation is relative to the start of the global offset table. */ - /* Check to make sure it isn't a protected function symbol - for shared library since it may not be local when used - as function address. We also need to make sure that a - symbol is defined locally. */ + /* Check to make sure it isn't a protected function or data + symbol for shared library since it may not be local when + used as function address or with copy relocation. We also + need to make sure that a symbol is defined locally. */ if (info->shared && h) { if (!h->def_regular) @@ -3748,12 +3748,15 @@ elf_i386_relocate_section (bfd *output_bfd, } else if (!info->executable && !SYMBOLIC_BIND (info, h) - && h->type == STT_FUNC + && (h->type == STT_FUNC + || h->type == STT_OBJECT) && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED) { (*_bfd_error_handler) - (_("%B: relocation R_386_GOTOFF against protected function `%s' can not be used when making a shared object"), - input_bfd, h->root.root.string); + (_("%B: relocation R_386_GOTOFF against protected %s `%s' can not be used when making a shared object"), + input_bfd, + h->type == STT_FUNC ? "function" : "data", + h->root.root.string); bfd_set_error (bfd_error_bad_value); return FALSE; } diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index ab72306bca..2b37c270f8 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -3955,19 +3955,22 @@ elf_x86_64_relocate_section (bfd *output_bfd, /* Relocation is relative to the start of the global offset table. */ - /* Check to make sure it isn't a protected function symbol - for shared library since it may not be local when used - as function address. */ + /* Check to make sure it isn't a protected function or data + symbol for shared library since it may not be local when + used as function address or with copy relocation. */ if (!info->executable && h && !SYMBOLIC_BIND (info, h) && h->def_regular - && h->type == STT_FUNC + && (h->type == STT_FUNC + || h->type == STT_OBJECT) && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED) { (*_bfd_error_handler) - (_("%B: relocation R_X86_64_GOTOFF64 against protected function `%s' can not be used when making a shared object"), - input_bfd, h->root.root.string); + (_("%B: relocation R_X86_64_GOTOFF64 against protected %s `%s' can not be used when making a shared object"), + input_bfd, + h->type == STT_FUNC ? "function" : "data", + h->root.root.string); bfd_set_error (bfd_error_bad_value); return FALSE; } diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 170ad04b5d..c4bc387a56 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,15 @@ +2015-04-10 H.J. Lu + + PR ld/pr17709 + * ld-i386/protected6.d: New file. + * ld-i386/protected6.s: Likewise. + * ld-x86-64/protected6.d: Likewise. + * ld-x86-64/protected6.s: Likewise. + * ld-x86-64/protected7.d: Likewise. + * ld-x86-64/protected7.s: Likewise. + * ld-x86-64/protected7a.d: Likewise. + * ld-x86-64/protected7b.d: Likewise. + 2015-04-10 H.J. Lu PR ld/pr15228 diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index 3fdd39ca20..3dd1139139 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -236,6 +236,7 @@ run_dump_test "protected2" run_dump_test "protected3" run_dump_test "protected4" run_dump_test "protected5" +run_dump_test "protected6" run_dump_test "tlspie1" run_dump_test "tlspie2" run_dump_test "nogot1" diff --git a/ld/testsuite/ld-i386/protected6.d b/ld/testsuite/ld-i386/protected6.d new file mode 100644 index 0000000000..37d513223f --- /dev/null +++ b/ld/testsuite/ld-i386/protected6.d @@ -0,0 +1,3 @@ +#as: --32 +#ld: -shared -melf_i386 +#error: .*relocation R_386_GOTOFF against protected data `foo' can not be used when making a shared object diff --git a/ld/testsuite/ld-i386/protected6.s b/ld/testsuite/ld-i386/protected6.s new file mode 100644 index 0000000000..f57900e833 --- /dev/null +++ b/ld/testsuite/ld-i386/protected6.s @@ -0,0 +1,14 @@ + .data + .protected foo + .globl foo + .align 4 + .type foo, @object + .size foo, 4 +foo: + .long 1 + .text + .globl bar + .type bar, @function +bar: + movl foo@GOTOFF(%ecx), %eax + .size bar, .-bar diff --git a/ld/testsuite/ld-x86-64/protected6.d b/ld/testsuite/ld-x86-64/protected6.d new file mode 100644 index 0000000000..872a9f6f4a --- /dev/null +++ b/ld/testsuite/ld-x86-64/protected6.d @@ -0,0 +1,3 @@ +#as: --64 +#ld: -shared -melf_x86_64 +#error: .*relocation R_X86_64_GOTOFF64 against protected data `foo' can not be used when making a shared object diff --git a/ld/testsuite/ld-x86-64/protected6.s b/ld/testsuite/ld-x86-64/protected6.s new file mode 100644 index 0000000000..8ac69c5161 --- /dev/null +++ b/ld/testsuite/ld-x86-64/protected6.s @@ -0,0 +1,14 @@ + .protected foo +.globl foo + .data + .align 4 + .type foo, @object + .size foo, 4 +foo: + .long 1 + .text + .globl bar + .type bar, @function +bar: + movabsq $foo@GOTOFF, %rax + .size bar, .-bar diff --git a/ld/testsuite/ld-x86-64/protected7.s b/ld/testsuite/ld-x86-64/protected7.s new file mode 100644 index 0000000000..df4765d643 --- /dev/null +++ b/ld/testsuite/ld-x86-64/protected7.s @@ -0,0 +1,12 @@ + .text +.globl foo + .protected foo + .type foo, @function +foo: + ret + .size foo, .-foo +.globl bar + .type bar, @function +bar: + movabsq $foo@GOTOFF, %rax + .size bar, .-bar diff --git a/ld/testsuite/ld-x86-64/protected7a.d b/ld/testsuite/ld-x86-64/protected7a.d new file mode 100644 index 0000000000..3082084a7b --- /dev/null +++ b/ld/testsuite/ld-x86-64/protected7a.d @@ -0,0 +1,4 @@ +#source: protected7.s +#as: --64 +#ld: -shared -melf_x86_64 +#error: .*relocation R_X86_64_GOTOFF64 against protected function `foo' can not be used when making a shared object diff --git a/ld/testsuite/ld-x86-64/protected7b.d b/ld/testsuite/ld-x86-64/protected7b.d new file mode 100644 index 0000000000..e18026c607 --- /dev/null +++ b/ld/testsuite/ld-x86-64/protected7b.d @@ -0,0 +1,6 @@ +#source: protected7.s +#as: --64 +#ld: -shared -Bsymbolic -melf_x86_64 +#readelf: -r + +There are no relocations in this file. diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 98514ed0ad..63754efdca 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -218,6 +218,9 @@ run_dump_test "protected3" run_dump_test "protected3-l1om" run_dump_test "protected4" run_dump_test "protected5" +run_dump_test "protected6" +run_dump_test "protected7a" +run_dump_test "protected7b" run_dump_test "tlsle1" run_dump_test "tlspie1" run_dump_test "unique1"