|
 |
ce426f |
# commit 7ec07d9a7b501f1b7d740fda02ba5f39d6d684e5
|
|
|
ce426f |
# Author: Alan Modra <amodra@gmail.com>
|
|
|
ce426f |
# Date: Wed Dec 4 06:44:06 2013 -0600
|
|
|
ce426f |
#
|
|
|
ce426f |
# PowerPC64: Report overflow on @h and @ha relocations
|
|
|
ce426f |
#
|
|
|
ce426f |
# This patch updates glibc in accordance with the binutils patch checked in here:
|
|
|
ce426f |
# https://sourceware.org/ml/binutils/2013-10/msg00372.html
|
|
|
ce426f |
#
|
|
|
ce426f |
# This changes the various R_PPC64_..._HI and _HA relocations to report
|
|
|
ce426f |
# 32-bit overflows. The motivation is that existing uses of @h / @ha
|
|
|
ce426f |
# are to build up 32-bit offsets (for the "medium model" TOC access
|
|
|
ce426f |
# that GCC now defaults to), and we'd really like to see failures at
|
|
|
ce426f |
# link / load time rather than silent truncations.
|
|
|
ce426f |
#
|
|
|
ce426f |
# For those rare cases where a modifier is needed to build up a 64-bit
|
|
|
ce426f |
# constant, new relocations _HIGH / _HIGHA are supported.
|
|
|
ce426f |
#
|
|
|
ce426f |
# The patch also fixes a bug in overflow checking for the R_PPC64_ADDR30
|
|
|
ce426f |
# and R_PPC64_ADDR32 relocations.
|
|
|
ce426f |
#
|
|
|
ce426f |
diff -urN glibc-2.17-c758a686/elf/elf.h glibc-2.17-c758a686/elf/elf.h
|
|
|
ce426f |
--- glibc-2.17-c758a686/elf/elf.h 2014-05-29 13:17:35.000000000 -0500
|
|
|
ce426f |
+++ glibc-2.17-c758a686/elf/elf.h 2014-05-29 13:17:35.000000000 -0500
|
|
|
ce426f |
@@ -2243,6 +2243,17 @@
|
|
|
ce426f |
#define R_PPC64_DTPREL16_HIGHERA 104 /* half16 (sym+add)@dtprel@highera */
|
|
|
ce426f |
#define R_PPC64_DTPREL16_HIGHEST 105 /* half16 (sym+add)@dtprel@highest */
|
|
|
ce426f |
#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */
|
|
|
ce426f |
+#define R_PPC64_TLSGD 107 /* none (sym+add)@tlsgd */
|
|
|
ce426f |
+#define R_PPC64_TLSLD 108 /* none (sym+add)@tlsld */
|
|
|
ce426f |
+#define R_PPC64_TOCSAVE 109 /* none */
|
|
|
ce426f |
+
|
|
|
ce426f |
+/* Added when HA and HI relocs were changed to report overflows. */
|
|
|
ce426f |
+#define R_PPC64_ADDR16_HIGH 110
|
|
|
ce426f |
+#define R_PPC64_ADDR16_HIGHA 111
|
|
|
ce426f |
+#define R_PPC64_TPREL16_HIGH 112
|
|
|
ce426f |
+#define R_PPC64_TPREL16_HIGHA 113
|
|
|
ce426f |
+#define R_PPC64_DTPREL16_HIGH 114
|
|
|
ce426f |
+#define R_PPC64_DTPREL16_HIGHA 115
|
|
|
ce426f |
|
|
|
ce426f |
/* GNU extension to support local ifunc. */
|
|
|
ce426f |
#define R_PPC64_JMP_IREL 247
|
|
|
ce426f |
diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h
|
|
|
ce426f |
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h 2014-05-29 13:17:34.000000000 -0500
|
|
|
ce426f |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h 2014-05-29 13:17:35.000000000 -0500
|
|
|
ce426f |
@@ -663,11 +663,25 @@
|
|
|
ce426f |
|
|
|
ce426f |
case R_PPC64_TPREL16_HI:
|
|
|
ce426f |
value = elf_machine_tprel (map, sym_map, sym, reloc);
|
|
|
ce426f |
+ if (dont_expect (value + 0x80000000 >= 0x100000000LL))
|
|
|
ce426f |
+ _dl_reloc_overflow (map, "R_PPC64_TPREL16_HI", reloc_addr, refsym);
|
|
|
ce426f |
+ *(Elf64_Half *) reloc_addr = PPC_HI (value);
|
|
|
ce426f |
+ break;
|
|
|
ce426f |
+
|
|
|
ce426f |
+ case R_PPC64_TPREL16_HIGH:
|
|
|
ce426f |
+ value = elf_machine_tprel (map, sym_map, sym, reloc);
|
|
|
ce426f |
*(Elf64_Half *) reloc_addr = PPC_HI (value);
|
|
|
ce426f |
break;
|
|
|
ce426f |
|
|
|
ce426f |
case R_PPC64_TPREL16_HA:
|
|
|
ce426f |
value = elf_machine_tprel (map, sym_map, sym, reloc);
|
|
|
ce426f |
+ if (dont_expect (value + 0x80008000 >= 0x100000000LL))
|
|
|
ce426f |
+ _dl_reloc_overflow (map, "R_PPC64_TPREL16_HA", reloc_addr, refsym);
|
|
|
ce426f |
+ *(Elf64_Half *) reloc_addr = PPC_HA (value);
|
|
|
ce426f |
+ break;
|
|
|
ce426f |
+
|
|
|
ce426f |
+ case R_PPC64_TPREL16_HIGHA:
|
|
|
ce426f |
+ value = elf_machine_tprel (map, sym_map, sym, reloc);
|
|
|
ce426f |
*(Elf64_Half *) reloc_addr = PPC_HA (value);
|
|
|
ce426f |
break;
|
|
|
ce426f |
|
|
|
ce426f |
@@ -703,17 +717,23 @@
|
|
|
ce426f |
break;
|
|
|
ce426f |
|
|
|
ce426f |
case R_PPC64_ADDR16_HI:
|
|
|
ce426f |
+ if (dont_expect (value + 0x80000000 >= 0x100000000LL))
|
|
|
ce426f |
+ _dl_reloc_overflow (map, "R_PPC64_ADDR16_HI", reloc_addr, refsym);
|
|
|
ce426f |
+ case R_PPC64_ADDR16_HIGH:
|
|
|
ce426f |
*(Elf64_Half *) reloc_addr = PPC_HI (value);
|
|
|
ce426f |
break;
|
|
|
ce426f |
|
|
|
ce426f |
case R_PPC64_ADDR16_HA:
|
|
|
ce426f |
+ if (dont_expect (value + 0x80008000 >= 0x100000000LL))
|
|
|
ce426f |
+ _dl_reloc_overflow (map, "R_PPC64_ADDR16_HA", reloc_addr, refsym);
|
|
|
ce426f |
+ case R_PPC64_ADDR16_HIGHA:
|
|
|
ce426f |
*(Elf64_Half *) reloc_addr = PPC_HA (value);
|
|
|
ce426f |
break;
|
|
|
ce426f |
|
|
|
ce426f |
case R_PPC64_ADDR30:
|
|
|
ce426f |
{
|
|
|
ce426f |
Elf64_Addr delta = value - (Elf64_Xword) reloc_addr;
|
|
|
ce426f |
- if (dont_expect ((delta + 0x80000000) >= 0x10000000
|
|
|
ce426f |
+ if (dont_expect ((delta + 0x80000000) >= 0x100000000LL
|
|
|
ce426f |
|| (delta & 3) != 0))
|
|
|
ce426f |
_dl_reloc_overflow (map, "R_PPC64_ADDR30", reloc_addr, refsym);
|
|
|
ce426f |
BIT_INSERT (*(Elf64_Word *) reloc_addr, delta, 0xfffffffc);
|
|
|
ce426f |
@@ -762,7 +782,7 @@
|
|
|
ce426f |
return;
|
|
|
ce426f |
|
|
|
ce426f |
case R_PPC64_ADDR32:
|
|
|
ce426f |
- if (dont_expect ((value + 0x80000000) >= 0x10000000))
|
|
|
ce426f |
+ if (dont_expect ((value + 0x80000000) >= 0x100000000LL))
|
|
|
ce426f |
_dl_reloc_overflow (map, "R_PPC64_ADDR32", reloc_addr, refsym);
|
|
|
ce426f |
*(Elf64_Word *) reloc_addr = value;
|
|
|
ce426f |
return;
|