fix potential read past end of buffer in getnameinfo host name lookup

[musl] / arch / x32 / reloc.h

diff --git a/arch/x32/reloc.h b/arch/x32/reloc.h
index 1261fb5..dc039ad 100644 (file)
--- a/arch/x32/reloc.h
+++ b/arch/x32/reloc.h
@@ -1,47 +1,31 @@
-#include <stdint.h>
-#include <string.h>
-#include <elf.h>
-
 #define LDSO_ARCH "x32"
 
-#define IS_COPY(x) ((x)==R_X86_64_COPY)
-#define IS_PLT(x) ((x)==R_X86_64_JUMP_SLOT)
+/* FIXME: x32 is very strange in its use of 64-bit relocation types in
+ * a 32-bit environment. As long as the memory at reloc_addr is
+ * zero-filled prior to relocations, just treating 64-bit relocations
+ * as operating on 32-bit slots should be fine, but this should be
+ * checked. In particular, R_X86_64_64, R_X86_64_DTPOFF64, and
+ * R_X86_64_TPOFF64 may need checking. */
+
+/* The R_X86_64_64, R_X86_64_DTPOFF32, and R_X86_64_TPOFF32 reloc types
+ * were previously mapped in the switch table form of this file; however,
+ * they do not seem to be used/usable for anything. If needed, new
+ * mappings will have to be added. */
+
+#define REL_SYMBOLIC    R_X86_64_32
+#define REL_OFFSET      R_X86_64_PC32
+#define REL_GOT         R_X86_64_GLOB_DAT
+#define REL_PLT         R_X86_64_JUMP_SLOT
+#define REL_RELATIVE    R_X86_64_RELATIVE
+#define REL_COPY        R_X86_64_COPY
+#define REL_DTPMOD      R_X86_64_DTPMOD64
+#define REL_DTPOFF      R_X86_64_DTPOFF64
+#define REL_TPOFF       R_X86_64_TPOFF64
+
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+       "mov %1,%%esp ; jmp *%0" : : "r"((uint64_t)(uintptr_t)pc), "r"(sp) : "memory" )
 
-static inline int do_single_reloc(
-       struct dso *self, unsigned char *base_addr,
-       size_t *reloc_addr, int type, size_t addend,
-       Sym *sym, size_t sym_size,
-       struct symdef def, size_t sym_val)
-{
-       switch(type) {
-       case R_X86_64_GLOB_DAT:
-       case R_X86_64_JUMP_SLOT:
-       case R_X86_64_64:
-               *reloc_addr = sym_val + addend;
-               break;
-       case R_X86_64_32:
-               *(uint32_t *)reloc_addr = sym_val + addend;
-               break;
-       case R_X86_64_PC32:
-               *reloc_addr = sym_val + addend - (size_t)reloc_addr + (size_t)base_addr;
-               break;
-       case R_X86_64_RELATIVE:
-               *reloc_addr = (size_t)base_addr + addend;
-               break;
-       case R_X86_64_COPY:
-               memcpy(reloc_addr, (void *)sym_val, sym_size);
-               break;
-       case R_X86_64_DTPMOD64:
-               *reloc_addr = def.dso ? def.dso->tls_id : self->tls_id;
-               break;
-       case R_X86_64_DTPOFF64:
-               *reloc_addr = def.sym->st_value + addend;
-               break;
-       case R_X86_64_TPOFF64:
-               *reloc_addr = (def.sym
-                       ? def.sym->st_value - def.dso->tls_offset
-                       : 0 - self->tls_offset) + addend;
-               break;
-       }
-       return 0;
-}
+#define GETFUNCSYM(fp, sym, got) __asm__ ( \
+       ".hidden " #sym "\n" \
+       "       lea " #sym "(%%rip),%0\n" \
+       : "=r"(*fp) : : "memory" )