Page MenuHomeFreeBSD
Files F146171591

D22608.id.diff
No OneTemporary
Actions

D22608.id.diff
View Options

Index: head/sys/arm/arm/elf_machdep.c
===================================================================
--- head/sys/arm/arm/elf_machdep.c
+++ head/sys/arm/arm/elf_machdep.c
@@ -321,6 +321,13 @@
}
int
+elf_cpu_parse_dynamic(linker_file_t lf __unused, Elf_Dyn *dynamic __unused)
+{
+
+ return (0);
+}
+
+int
elf_cpu_unload_file(linker_file_t lf)
{
Index: head/sys/arm64/arm64/elf_machdep.c
===================================================================
--- head/sys/arm64/arm64/elf_machdep.c
+++ head/sys/arm64/arm64/elf_machdep.c
@@ -216,3 +216,10 @@
return (0);
}
+
+int
+elf_cpu_parse_dynamic(linker_file_t lf __unused, Elf_Dyn *dynamic __unused)
+{
+
+ return (0);
+}
Index: head/sys/i386/i386/elf_machdep.c
===================================================================
--- head/sys/i386/i386/elf_machdep.c
+++ head/sys/i386/i386/elf_machdep.c
@@ -295,3 +295,10 @@
return (0);
}
+
+int
+elf_cpu_parse_dynamic(linker_file_t lf __unused, Elf_Dyn *dynamic __unused)
+{
+
+ return (0);
+}
Index: head/sys/kern/link_elf.c
===================================================================
--- head/sys/kern/link_elf.c
+++ head/sys/kern/link_elf.c
@@ -611,7 +611,7 @@
ef->ddbstrtab = ef->strtab;
ef->ddbstrcnt = ef->strsz;
- return (0);
+ return elf_cpu_parse_dynamic(&ef->lf, ef->dynamic);
}
#define LS_PADDING 0x90909090
Index: head/sys/powerpc/powerpc/elf32_machdep.c
===================================================================
--- head/sys/powerpc/powerpc/elf32_machdep.c
+++ head/sys/powerpc/powerpc/elf32_machdep.c
@@ -63,6 +63,7 @@
extern const char *freebsd32_syscallnames[];
static void ppc32_fixlimit(struct rlimit *rl, int which);
+static void ppc32_runtime_resolve(void);
static SYSCTL_NODE(_compat, OID_AUTO, ppc32, CTLFLAG_RW, 0, "32-bit mode");
@@ -296,6 +297,20 @@
*where = elf_relocaddr(lf, relocbase + addend);
break;
+ case R_PPC_JMP_SLOT: /* PLT jump slot entry */
+ /*
+ * We currently only support Secure-PLT jump slots.
+ * Given that we reject BSS-PLT modules during load, we
+ * don't need to check again.
+ * The method we are using here is equivilent to
+ * LD_BIND_NOW.
+ */
+ error = lookup(lf, symidx, 1, &addr);
+ if (error != 0)
+ return -1;
+ *where = elf_relocaddr(lf, addr + addend);
+ break;
+
default:
printf("kldload: unexpected relocation type %d\n",
(int) rtype);
@@ -356,6 +371,7 @@
int
elf_cpu_load_file(linker_file_t lf)
{
+
/* Only sync the cache for non-kernel modules */
if (lf->id != 1)
__syncicache(lf->address, lf->size);
@@ -366,6 +382,47 @@
elf_cpu_unload_file(linker_file_t lf __unused)
{
+ return (0);
+}
+
+static void
+ppc32_runtime_resolve()
+{
+
+ /*
+ * Since we don't support lazy binding, panic immediately if anyone
+ * manages to call the runtime resolver.
+ */
+ panic("kldload: Runtime resolver was called unexpectedly!");
+}
+
+int
+elf_cpu_parse_dynamic(linker_file_t lf, Elf_Dyn *dynamic)
+{
+ Elf_Dyn *dp;
+ bool has_plt = false;
+ bool secure_plt = false;
+ Elf_Addr *got;
+
+ for (dp = dynamic; dp->d_tag != DT_NULL; dp++) {
+ switch (dp->d_tag) {
+ case DT_PPC_GOT:
+ secure_plt = true;
+ got = (Elf_Addr *)(lf->address + dp->d_un.d_ptr);
+ /* Install runtime resolver canary. */
+ got[1] = (Elf_Addr)ppc32_runtime_resolve;
+ got[2] = (Elf_Addr)0;
+ break;
+ case DT_PLTGOT:
+ has_plt = true;
+ break;
+ }
+ }
+
+ if (has_plt && !secure_plt) {
+ printf("kldload: BSS-PLT modules are not supported.\n");
+ return (-1);
+ }
return (0);
}
#endif
Index: head/sys/powerpc/powerpc/elf64_machdep.c
===================================================================
--- head/sys/powerpc/powerpc/elf64_machdep.c
+++ head/sys/powerpc/powerpc/elf64_machdep.c
@@ -410,3 +410,10 @@
return (0);
}
+
+int
+elf_cpu_parse_dynamic(linker_file_t lf __unused, Elf_Dyn *dynamic __unused)
+{
+
+ return (0);
+}
Index: head/sys/riscv/riscv/elf_machdep.c
===================================================================
--- head/sys/riscv/riscv/elf_machdep.c
+++ head/sys/riscv/riscv/elf_machdep.c
@@ -504,3 +504,10 @@
return (0);
}
+
+int
+elf_cpu_parse_dynamic(linker_file_t lf __unused, Elf_Dyn *dynamic __unused)
+{
+
+ return (0);
+}
Index: head/sys/sparc64/sparc64/elf_machdep.c
===================================================================
--- head/sys/sparc64/sparc64/elf_machdep.c
+++ head/sys/sparc64/sparc64/elf_machdep.c
@@ -429,3 +429,10 @@
return (0);
}
+
+int
+elf_cpu_parse_dynamic(linker_file_t lf __unused, Elf_Dyn *dynamic __unused)
+{
+
+ return (0);
+}
Index: head/sys/sys/linker.h
===================================================================
--- head/sys/sys/linker.h
+++ head/sys/sys/linker.h
@@ -305,6 +305,10 @@
int elf_cpu_load_file(linker_file_t);
int elf_cpu_unload_file(linker_file_t);
+/* amd64 and mips use objects instead of shared libraries */
+#if !defined(__amd64__) && !defined(__mips__)
+int elf_cpu_parse_dynamic(linker_file_t, Elf_Dyn *);
+#endif
/* values for type */
#define ELF_RELOC_REL 1

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 1, 10:45 AM (1 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29110170
Default Alt Text
D22608.id.diff (4 KB)

Event Timeline