kernel: fix crashes on MIPS when loading kernel modules under memory pressure

When memory is tight, modules may need to be loaded into vmalloc()
space. The code then has to generate jump trampolines which enable
relocations between vmalloc space and physical address space.

The code had a bug that was freeing these trampolines even when the
module was successfully loaded.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
master
Felix Fietkau 8 years ago
parent 2a6fbce121
commit 1e1a0592f8
  1. 5
      target/linux/generic/patches-3.18/305-mips_module_reloc.patch
  2. 5
      target/linux/generic/patches-4.4/305-mips_module_reloc.patch
  3. 5
      target/linux/generic/patches-4.9/305-mips_module_reloc.patch

@ -317,7 +317,7 @@
return 0;
}
@@ -287,9 +529,33 @@ int module_finalize(const Elf_Ehdr *hdr,
@@ -287,9 +529,36 @@ int module_finalize(const Elf_Ehdr *hdr,
list_add(&me->arch.dbe_list, &dbe_list);
spin_unlock_irq(&dbe_lock);
}
@ -338,6 +338,9 @@
+void module_arch_freeing_init(struct module *mod)
+{
+ if (mod->state == MODULE_STATE_LIVE)
+ return;
+
+ if (mod->arch.phys_plt_tbl) {
+ __module_free(mod->arch.phys_plt_tbl);
+ mod->arch.phys_plt_tbl = NULL;

@ -316,7 +316,7 @@
return 0;
}
@@ -287,9 +528,33 @@ int module_finalize(const Elf_Ehdr *hdr,
@@ -287,9 +528,36 @@ int module_finalize(const Elf_Ehdr *hdr,
list_add(&me->arch.dbe_list, &dbe_list);
spin_unlock_irq(&dbe_lock);
}
@ -337,6 +337,9 @@
+void module_arch_freeing_init(struct module *mod)
+{
+ if (mod->state == MODULE_STATE_LIVE)
+ return;
+
+ if (mod->arch.phys_plt_tbl) {
+ __module_free(mod->arch.phys_plt_tbl);
+ mod->arch.phys_plt_tbl = NULL;

@ -315,7 +315,7 @@
return 0;
}
@@ -349,9 +591,33 @@ int module_finalize(const Elf_Ehdr *hdr,
@@ -349,9 +591,36 @@ int module_finalize(const Elf_Ehdr *hdr,
list_add(&me->arch.dbe_list, &dbe_list);
spin_unlock_irq(&dbe_lock);
}
@ -336,6 +336,9 @@
+void module_arch_freeing_init(struct module *mod)
+{
+ if (mod->state == MODULE_STATE_LIVE)
+ return;
+
+ if (mod->arch.phys_plt_tbl) {
+ __module_free(mod->arch.phys_plt_tbl);
+ mod->arch.phys_plt_tbl = NULL;

Loading…
Cancel
Save