R_PPC64_GOT_LO_DS and R_PPC64_GOT_HA sanity check

The previous sanity check allowed a ld on the HA reloc and addis
on the LO_DS.

	* elf64-ppc.c (ppc64_elf_relocate_section): Tighten sanity check
	on R_PPC64_GOT_LO_DS and R_PPC64_GOT_HA instructions.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3ff3b1e23959c1982b70fadb6a99d2da080ec3da..7083e47dddda77ab57ec63b6e006433a33e3674b 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2020-10-16  Alan Modra  <amodra@gmail.com>
+
+       * elf64-ppc.c (ppc64_elf_relocate_section): Tighten sanity check
+       on R_PPC64_GOT_LO_DS and R_PPC64_GOT_HA instructions.
+
 2020-10-09  Alan Modra  <amodra@gmail.com>
 
        * elf64-ppc.c (write_plt_relocs_for_local_syms): Don't do local

diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index c30215b55070ccf4ccdadd885169f3d823ac96d9..157c454d854116081e944a31809ed2fcefc75754 100644 (file)
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -16091,14 +16091,16 @@ ppc64_elf_relocate_section (bfd *output_bfd,
              && (h == NULL || SYMBOL_REFERENCES_LOCAL (info, &h->elf)))
            {
              insn = bfd_get_32 (input_bfd, contents + (rel->r_offset & ~3));
-             if ((insn & (0x3fu << 26 | 0x3)) == 58u << 26 /* ld */)
+             if (r_type == R_PPC64_GOT16_LO_DS
+                 && (insn & (0x3fu << 26 | 0x3)) == 58u << 26 /* ld */)
                {
                  insn += (14u << 26) - (58u << 26);
                  bfd_put_32 (input_bfd, insn, contents + (rel->r_offset & ~3));
                  r_type = R_PPC64_TOC16_LO;
                  rel->r_info = ELF64_R_INFO (r_symndx, r_type);
                }
-             else if ((insn & (0x3fu << 26)) == 15u << 26 /* addis */)
+             else if (r_type == R_PPC64_GOT16_HA
+                      && (insn & (0x3fu << 26)) == 15u << 26 /* addis */)
                {
                  r_type = R_PPC64_TOC16_HA;
                  rel->r_info = ELF64_R_INFO (r_symndx, r_type);