summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-07-18 22:28:46 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-07-18 22:28:46 +0000
commit9c0e4a40eb3753efeca04bdbec746b8e03599f6c (patch)
tree00cffac92f712638e5b0dc2f1a44b761887c76f6 /target/linux
parenta9f188546b65217d31a8b6f5a24e5af39cdc0259 (diff)
mips: fix another bug in the module relocation change: the wrong base address for 24 bit jump -> long jump fixup table was used
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16904 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/026-mips_module_reloc.patch21
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch21
2 files changed, 18 insertions, 24 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/026-mips_module_reloc.patch b/target/linux/generic-2.6/patches-2.6.28/026-mips_module_reloc.patch
index ddf92b27e9..dd035b945d 100644
--- a/target/linux/generic-2.6/patches-2.6.28/026-mips_module_reloc.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/026-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);
}
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 66ceffa0ec..c10da0a645 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);
}