diff options
| author | Felix Fietkau <nbd@nbd.name> | 2019-12-27 19:46:02 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2019-12-27 19:47:41 +0100 |
| commit | b2d10977a860f34e003ed158d6d208f431a14579 (patch) | |
| tree | f236dda06a16841b7de2a7fbde73f710701d95de /target/linux/generic | |
| parent | e0382e88a919d342dd6fbf07971ceab15d0b6aaf (diff) | |
| download | upstream-b2d10977a860f34e003ed158d6d208f431a14579.tar.gz upstream-b2d10977a860f34e003ed158d6d208f431a14579.tar.bz2 upstream-b2d10977a860f34e003ed158d6d208f431a14579.zip | |
Revert "kernel: fix kmemleak warnings introduced in 305-mips_module_reloc.patch"
This reverts commit a03afef7f2e8ae363a97357ec75ffbfef372a9ea.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/pending-4.14/305-mips_module_reloc.patch | 15 | ||||
| -rw-r--r-- | target/linux/generic/pending-4.19/305-mips_module_reloc.patch | 15 |
2 files changed, 12 insertions, 18 deletions
diff --git a/target/linux/generic/pending-4.14/305-mips_module_reloc.patch b/target/linux/generic/pending-4.14/305-mips_module_reloc.patch index f1e07e1726..609a96db49 100644 --- a/target/linux/generic/pending-4.14/305-mips_module_reloc.patch +++ b/target/linux/generic/pending-4.14/305-mips_module_reloc.patch @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */ --- a/arch/mips/kernel/module.c +++ b/arch/mips/kernel/module.c -@@ -44,14 +44,224 @@ struct mips_hi16 { +@@ -44,14 +44,221 @@ struct mips_hi16 { static LIST_HEAD(dbe_list); static DEFINE_SPINLOCK(dbe_lock); @@ -187,7 +187,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> + if (!ptr) + return vmalloc(size); + -+ kmemleak_alloc(ptr, size, 1, GFP_KERNEL); + return ptr; +#endif } @@ -204,12 +203,10 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> +/* Free memory returned from module_alloc */ +void module_memfree(void *module_region) +{ -+ if (is_phys_addr(module_region)) { -+ kmemleak_free(module_region); ++ if (is_phys_addr(module_region)) + free_phys(module_region); -+ } else { ++ else + vfree(module_region); -+ } +} + +static void *__module_alloc(int size, bool phys) @@ -272,7 +269,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static int apply_r_mips_none(struct module *me, u32 *location, u32 base, Elf_Addr v, bool rela) -@@ -67,9 +277,40 @@ static int apply_r_mips_32(struct module +@@ -67,9 +274,40 @@ static int apply_r_mips_32(struct module return 0; } @@ -313,7 +310,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (v % 4) { pr_err("module %s: dangerous R_MIPS_26 relocation\n", me->name); -@@ -77,13 +318,17 @@ static int apply_r_mips_26(struct module +@@ -77,13 +315,17 @@ static int apply_r_mips_26(struct module } if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) { @@ -335,7 +332,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> return 0; } -@@ -459,9 +704,36 @@ int module_finalize(const Elf_Ehdr *hdr, +@@ -459,9 +701,36 @@ 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/pending-4.19/305-mips_module_reloc.patch b/target/linux/generic/pending-4.19/305-mips_module_reloc.patch index 1f98dfd8ef..a8e4e78c91 100644 --- a/target/linux/generic/pending-4.19/305-mips_module_reloc.patch +++ b/target/linux/generic/pending-4.19/305-mips_module_reloc.patch @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */ --- a/arch/mips/kernel/module.c +++ b/arch/mips/kernel/module.c -@@ -44,14 +44,224 @@ struct mips_hi16 { +@@ -44,14 +44,221 @@ struct mips_hi16 { static LIST_HEAD(dbe_list); static DEFINE_SPINLOCK(dbe_lock); @@ -187,7 +187,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> + if (!ptr) + return vmalloc(size); + -+ kmemleak_alloc(ptr, size, 1, GFP_KERNEL); + return ptr; +#endif } @@ -204,12 +203,10 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> +/* Free memory returned from module_alloc */ +void module_memfree(void *module_region) +{ -+ if (is_phys_addr(module_region)) { -+ kmemleak_free(module_region); ++ if (is_phys_addr(module_region)) + free_phys(module_region); -+ } else { ++ else + vfree(module_region); -+ } +} + +static void *__module_alloc(int size, bool phys) @@ -272,7 +269,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static int apply_r_mips_none(struct module *me, u32 *location, u32 base, Elf_Addr v, bool rela) -@@ -67,9 +277,40 @@ static int apply_r_mips_32(struct module +@@ -67,9 +274,40 @@ static int apply_r_mips_32(struct module return 0; } @@ -313,7 +310,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (v % 4) { pr_err("module %s: dangerous R_MIPS_26 relocation\n", me->name); -@@ -77,13 +318,17 @@ static int apply_r_mips_26(struct module +@@ -77,13 +315,17 @@ static int apply_r_mips_26(struct module } if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) { @@ -335,7 +332,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> return 0; } -@@ -459,9 +704,36 @@ int module_finalize(const Elf_Ehdr *hdr, +@@ -459,9 +701,36 @@ int module_finalize(const Elf_Ehdr *hdr, list_add(&me->arch.dbe_list, &dbe_list); spin_unlock_irq(&dbe_lock); } |