M68k module loader
Geert Uytterhoeven
maintainerPATCH 1/1 M68k module loader
M68k: Add missing relocation support to module loader (from Matthias Urlichs)
arch/m68k/kernel/module.c +32 -3
@@ -82,9 +82,38 @@unsigned int relsec, struct module *me) { - printk(KERN_ERR "module %s: ADD RELOCATION unsupported\n", - me->name); -return -ENOEXEC ; + unsigned int i; +Elf32_Rela *rel = (void *)sechdrs[relsec].sh_addr; +Elf32_Sym *sym; +uint32_t *location; + +DEBUGP ("Applying relocate_add section %u to %u\n" , relsec, + sechdrs[relsec].sh_info); +for (i =0 ; i < sechdrs[relsec].sh_size /sizeof (*rel); i++) { +/* This is where to make the change */ + location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + + rel[i].r_offset; +/* This is the symbol it is referring to. Note that all +undefined symbols have been resolved. */ + sym = (Elf32_Sym *)sechdrs[symindex].sh_addr + +ELF32_R_SYM (rel[i].r_info); + +switch (ELF32_R_TYPE (rel[i].r_info)) { +case R_68K_32 : +/* We add the value into the location given */ + *location = rel[i].r_addend + sym->st_value; +break ; +case R_68K_PC32 : +/* Add the value, subtract its postition */ + *location = rel[i].r_addend + sym->st_value - (uint32_t )location; +break ; +default : +printk (KERN_ERR "module %s: Unknown relocation: %u\n" , + me->name,ELF32_R_TYPE (rel[i].r_info)); +return -ENOEXEC ; + } + } +return 0 ; } int module_finalize(const Elf_Ehdr *hdr,
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds