mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 05:31:08 -04:00
powerpc64: Add .opd based function descriptor dereference
We are moving towards separate kernel and module function descriptor dereference callbacks. This patch enables it for powerpc64. For pointers that belong to the kernel - Added __start_opd and __end_opd pointers, to track the kernel .opd section address range; - Added dereference_kernel_function_descriptor(). Now we will dereference only function pointers that are within [__start_opd, __end_opd); For pointers that belong to a module - Added dereference_module_function_descriptor() to handle module function descriptor dereference. Now we will dereference only pointers that are within [module->opd.start, module->opd.end). Link: http://lkml.kernel.org/r/[email protected] To: Tony Luck <[email protected]> To: Fenghua Yu <[email protected]> To: Helge Deller <[email protected]> To: Benjamin Herrenschmidt <[email protected]> To: Paul Mackerras <[email protected]> To: Michael Ellerman <[email protected]> To: James Bottomley <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Jessica Yu <[email protected]> Cc: Petr Mladek <[email protected]> Cc: Steven Rostedt <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: Sergey Senozhatsky <[email protected]> Cc: Sergey Senozhatsky <[email protected]> Signed-off-by: Sergey Senozhatsky <[email protected]> Tested-by: Santosh Sivaraj <[email protected]> #powerpc Signed-off-by: Petr Mladek <[email protected]>
This commit is contained in:
1 parent
8e30788816
commit
5633e85b2c
4 files changed
+31
No files matched your search
@@ -45,6 +45,9 @@ struct mod_arch_specific {
|
||||
unsigned long tramp;
|
||||
#endif
|
||||
|
||||
/* For module function descriptor dereference */
|
||||
unsigned long start_opd;
|
||||
unsigned long end_opd;
|
||||
#else /* powerpc64 */
|
||||
/* Indices of PLT sections within module. */
|
||||
unsigned int core_plt_section;
|
||||
|
||||
@@ -66,6 +66,9 @@ static inline int overlaps_kvm_tmp(unsigned long start, unsigned long end)
|
||||
}
|
||||
|
||||
#ifdef PPC64_ELF_ABI_v1
|
||||
|
||||
#define HAVE_DEREFERENCE_FUNCTION_DESCRIPTOR 1
|
||||
|
||||
#undef dereference_function_descriptor
|
||||
static inline void *dereference_function_descriptor(void *ptr)
|
||||
{
|
||||
@@ -76,6 +79,15 @@ static inline void *dereference_function_descriptor(void *ptr)
|
||||
ptr = p;
|
||||
return ptr;
|
||||
}
|
||||
|
||||
#undef dereference_kernel_function_descriptor
|
||||
static inline void *dereference_kernel_function_descriptor(void *ptr)
|
||||
{
|
||||
if (ptr < (void *)__start_opd || ptr >= (void *)__end_opd)
|
||||
return ptr;
|
||||
|
||||
return dereference_function_descriptor(ptr);
|
||||
}
|
||||
#endif /* PPC64_ELF_ABI_v1 */
|
||||
|
||||
#endif
|
||||
|
||||
@@ -93,6 +93,15 @@ static unsigned int local_entry_offset(const Elf64_Sym *sym)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void *dereference_module_function_descriptor(struct module *mod, void *ptr)
|
||||
{
|
||||
if (ptr < (void *)mod->arch.start_opd ||
|
||||
ptr >= (void *)mod->arch.end_opd)
|
||||
return ptr;
|
||||
|
||||
return dereference_function_descriptor(ptr);
|
||||
}
|
||||
#endif
|
||||
|
||||
#define STUB_MAGIC 0x73747562 /* stub */
|
||||
@@ -344,6 +353,11 @@ int module_frob_arch_sections(Elf64_Ehdr *hdr,
|
||||
else if (strcmp(secstrings+sechdrs[i].sh_name,"__versions")==0)
|
||||
dedotify_versions((void *)hdr + sechdrs[i].sh_offset,
|
||||
sechdrs[i].sh_size);
|
||||
else if (!strcmp(secstrings + sechdrs[i].sh_name, ".opd")) {
|
||||
me->arch.start_opd = sechdrs[i].sh_addr;
|
||||
me->arch.end_opd = sechdrs[i].sh_addr +
|
||||
sechdrs[i].sh_size;
|
||||
}
|
||||
|
||||
/* We don't handle .init for the moment: rename to _init */
|
||||
while ((p = strstr(secstrings + sechdrs[i].sh_name, ".init")))
|
||||
|
||||
@@ -278,7 +278,9 @@ SECTIONS
|
||||
}
|
||||
|
||||
.opd : AT(ADDR(.opd) - LOAD_OFFSET) {
|
||||
__start_opd = .;
|
||||
*(.opd)
|
||||
__end_opd = .;
|
||||
}
|
||||
|
||||
. = ALIGN(256);
|
||||
|
||||
Reference in new issue
Block a user