diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-07-18 22:28:46 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-07-18 22:28:46 +0000 |
| commit | 1685ce5f3d3c8805c9673445d9b62ce315b92997 (patch) | |
| tree | d178b41d3f51bec236462e56585b4aaf9b11953b /target/linux/generic-2.6/patches-2.6.30 | |
| parent | cf2c544844f71628a81823af2af2f6ec7d4a082a (diff) | |
| download | mtk-20170518-1685ce5f3d3c8805c9673445d9b62ce315b92997.zip mtk-20170518-1685ce5f3d3c8805c9673445d9b62ce315b92997.tar.gz mtk-20170518-1685ce5f3d3c8805c9673445d9b62ce315b92997.tar.bz2 | |
mips: fix another bug in the module relocation change: the wrong base address for 24 bit jump -> long jump fixup table was used
SVN-Revision: 16904
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch b/target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch index 66ceffa..c10da0a 100644 --- a/target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch +++ b/target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch @@ -209,13 +209,13 @@ return 0; } -@@ -97,27 +248,44 @@ static int apply_r_mips_32_rela(struct m +@@ -97,27 +248,41 @@ static int apply_r_mips_32_rela(struct m return 0; } -static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v) +static Elf_Addr add_plt_entry_to(unsigned *plt_offset, -+ void *start, unsigned size, Elf_Addr v) ++ void *start, Elf_Addr v) { - if (v % 4) { - printk(KERN_ERR "module %s: dangerous relocation\n", me->name); @@ -229,17 +229,14 @@ - me->name); - return -ENOEXEC; - } -+ if (*plt_offset == size) -+ return 0; - -- *location = (*location & ~0x03ffffff) | -- ((*location + (v >> 2)) & 0x03ffffff); + *plt_offset += 4 * sizeof(int); + + /* adjust carry for addiu */ + if (v & 0x00008000) + v += 0x10000; -+ + +- *location = (*location & ~0x03ffffff) | +- ((*location + (v >> 2)) & 0x03ffffff); + tramp[0] = 0x3c190000 | (v >> 16); /* lui t9, hi16 */ + tramp[1] = 0x27390000 | (v & 0xffff); /* addiu t9, t9, lo16 */ + tramp[2] = 0x03200008; /* jr t9 */ @@ -253,12 +250,12 @@ + if (location >= me->module_core && + location < me->module_core + me->core_size) + return add_plt_entry_to(&me->arch.core_plt_offset, -+ me->module_core, me->core_size, v); ++ me->arch.plt_tbl, v); + + if (location >= me->module_init && + location < me->module_init + me->init_size) + return add_plt_entry_to(&me->arch.init_plt_offset, -+ me->module_init, me->init_size, v); ++ me->arch.plt_tbl, v); return 0; } @@ -268,7 +265,7 @@ { if (v % 4) { printk(KERN_ERR "module %s: dangerous relocation\n", me->name); -@@ -125,17 +293,31 @@ static int apply_r_mips_26_rela(struct m +@@ -125,17 +290,31 @@ static int apply_r_mips_26_rela(struct m } if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) { @@ -303,7 +300,7 @@ static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v) { struct mips_hi16 *n; -@@ -400,11 +582,23 @@ int module_finalize(const Elf_Ehdr *hdr, +@@ -400,11 +579,23 @@ int module_finalize(const Elf_Ehdr *hdr, list_add(&me->arch.dbe_list, &dbe_list); spin_unlock_irq(&dbe_lock); } |