diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2022-07-18 11:44:32 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2022-07-19 09:01:35 -0700 |
| commit | 17f1c83d5ba7a1d3898265face9027ea02c3fb8c (patch) | |
| tree | 6bb8e4a06a79af28c9323dfda5eefe13ab8f78dc | |
| parent | 477d69e15caef3c955401779115f5e49d794f2f6 (diff) | |
x86: Properly check invalid relocation against protected symbol
Only check invalid relocation against protected symbol defined in shared
object.
bfd/
PR ld/29377
* elf32-i386.c (elf_i386_scan_relocs): Only check invalid
relocation against protected symbol defined in shared object.
* elf64-x86-64.c (elf_x86_64_scan_relocs): Likewise.
ld/
PR ld/29377
* testsuite/ld-elf/linux-x86.exp: Run PR ld/29377 tests.
* testsuite/ld-elf/pr29377a.c: New file.
* testsuite/ld-elf/pr29377b.c: Likewise.
(cherry picked from commit bd0736124c20950ac353f01e5029b7cb5d8a7010)
ld: Pass -nostdlib to compiler with -r
Pass -nostdlib to compiler with -r to avoid unnecessary .o file and
libraries.
PR ld/29377
* testsuite/ld-elf/linux-x86.exp: Pass -nostdlib with -r.
(cherry picked from commit 76e4fa70e79ee959c0e11eaacd4cf863291b1ddb)
| -rw-r--r-- | bfd/elf32-i386.c | 2 | ||||
| -rw-r--r-- | bfd/elf64-x86-64.c | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/linux-x86.exp | 16 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/pr29377a.c | 5 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/pr29377b.c | 10 |
5 files changed, 35 insertions, 0 deletions
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index e4106d9fd3..3d39dc07fe 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -1811,6 +1811,8 @@ elf_i386_scan_relocs (bfd *abfd, if (h->pointer_equality_needed && h->type == STT_FUNC && eh->def_protected + && !SYMBOL_DEFINED_NON_SHARED_P (h) + && h->def_dynamic && elf_has_indirect_extern_access (h->root.u.def.section->owner)) { /* Disallow non-canonical reference to canonical diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 6154a70bdd..48ca6309d1 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -2254,6 +2254,8 @@ elf_x86_64_scan_relocs (bfd *abfd, struct bfd_link_info *info, if (h->pointer_equality_needed && h->type == STT_FUNC && eh->def_protected + && !SYMBOL_DEFINED_NON_SHARED_P (h) + && h->def_dynamic && elf_has_indirect_extern_access (h->root.u.def.section->owner)) { /* Disallow non-canonical reference to canonical diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp index 6035ecd682..06379057ff 100644 --- a/ld/testsuite/ld-elf/linux-x86.exp +++ b/ld/testsuite/ld-elf/linux-x86.exp @@ -134,6 +134,22 @@ run_cc_link_tests [list \ {{readelf {--dyn-syms -W} pr28158.rd} {nm -D pr28158.nd}} \ "pr28158" \ ] \ + [list \ + "Build pr29377.o" \ + "-r -nostdlib -Wl,-z,noexecstack" \ + "" \ + {pr29377a.c indirect-extern-access.S} \ + {} \ + "pr29377.o" \ + ] \ + [list \ + "Build pr29377" \ + "$NOPIE_LDFLAGS tmpdir/pr29377.o" \ + "-fPIC" \ + {pr29377b.c} \ + {} \ + "pr29377" \ + ] \ ] run_ld_link_exec_tests [list \ diff --git a/ld/testsuite/ld-elf/pr29377a.c b/ld/testsuite/ld-elf/pr29377a.c new file mode 100644 index 0000000000..41d9545e3b --- /dev/null +++ b/ld/testsuite/ld-elf/pr29377a.c @@ -0,0 +1,5 @@ +__attribute__ ((visibility ("protected"))) +void +foo (void) +{ +} diff --git a/ld/testsuite/ld-elf/pr29377b.c b/ld/testsuite/ld-elf/pr29377b.c new file mode 100644 index 0000000000..3cf163b25b --- /dev/null +++ b/ld/testsuite/ld-elf/pr29377b.c @@ -0,0 +1,10 @@ +extern void foo (void); + +void (*foo_p) (void); + +int +main () +{ + foo_p = foo; + return 0; +} |