ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-22 06:57:57 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

kernel: fix kmemleak warnings introduced in 305-mips_module_reloc.patch

Browse Source 
Physically allocated memory for modules needs to be registered with kmemleak,
so it can track it as object.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2019-11-06 16:38:43 +01:00
parent d5ede68f8b
commit 441052f44a
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
target/linux/generic/pending-4.14/305-mips_module_reloc.patch
View File

@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */ typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */
--- a/arch/mips/kernel/module.c --- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c +++ b/arch/mips/kernel/module.c
@@ -44,14 +44,221 @@ struct mips_hi16 { @@ -44,14 +44,224 @@ struct mips_hi16 {
static LIST_HEAD(dbe_list); static LIST_HEAD(dbe_list);
static DEFINE_SPINLOCK(dbe_lock); static DEFINE_SPINLOCK(dbe_lock);
@ -187,6 +187,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ if (!ptr) + if (!ptr)
+ return vmalloc(size); + return vmalloc(size);
+ +
+ kmemleak_alloc(ptr, size, 1, GFP_KERNEL);
+ return ptr; + return ptr;
+#endif +#endif
} }
@ -203,10 +204,12 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+/* Free memory returned from module_alloc */ +/* Free memory returned from module_alloc */
+void module_memfree(void *module_region) +void module_memfree(void *module_region)
+{ +{
+ if (is_phys_addr(module_region)) + if (is_phys_addr(module_region)) {
+ kmemleak_free(module_region);
+ free_phys(module_region); + free_phys(module_region);
+ else + } else {
+ vfree(module_region); + vfree(module_region);
+ }
+} +}
+ +
+static void *__module_alloc(int size, bool phys) +static void *__module_alloc(int size, bool phys)
@ -269,7 +272,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static int apply_r_mips_none(struct module *me, u32 *location, static int apply_r_mips_none(struct module *me, u32 *location,
u32 base, Elf_Addr v, bool rela) u32 base, Elf_Addr v, bool rela)
@@ -67,9 +274,40 @@ static int apply_r_mips_32(struct module @@ -67,9 +277,40 @@ static int apply_r_mips_32(struct module
return 0; return 0;
} }
@ -310,7 +313,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (v % 4) { if (v % 4) {
pr_err("module %s: dangerous R_MIPS_26 relocation\n", pr_err("module %s: dangerous R_MIPS_26 relocation\n",
me->name); me->name);
@@ -77,13 +315,17 @@ static int apply_r_mips_26(struct module @@ -77,13 +318,17 @@ static int apply_r_mips_26(struct module
} }
if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) { if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
@ -332,7 +335,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
return 0; return 0;
} }
@@ -459,9 +701,36 @@ int module_finalize(const Elf_Ehdr *hdr, @@ -459,9 +704,36 @@ int module_finalize(const Elf_Ehdr *hdr,
list_add(&me->arch.dbe_list, &dbe_list); list_add(&me->arch.dbe_list, &dbe_list);
spin_unlock_irq(&dbe_lock); spin_unlock_irq(&dbe_lock);
} }

15
target/linux/generic/pending-4.19/305-mips_module_reloc.patch
View File

@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */ typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */
--- a/arch/mips/kernel/module.c --- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c +++ b/arch/mips/kernel/module.c
@@ -44,14 +44,221 @@ struct mips_hi16 { @@ -44,14 +44,224 @@ struct mips_hi16 {
static LIST_HEAD(dbe_list); static LIST_HEAD(dbe_list);
static DEFINE_SPINLOCK(dbe_lock); static DEFINE_SPINLOCK(dbe_lock);
@ -187,6 +187,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ if (!ptr) + if (!ptr)
+ return vmalloc(size); + return vmalloc(size);
+ +
+ kmemleak_alloc(ptr, size, 1, GFP_KERNEL);
+ return ptr; + return ptr;
+#endif +#endif
} }
@ -203,10 +204,12 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+/* Free memory returned from module_alloc */ +/* Free memory returned from module_alloc */
+void module_memfree(void *module_region) +void module_memfree(void *module_region)
+{ +{
+ if (is_phys_addr(module_region)) + if (is_phys_addr(module_region)) {
+ kmemleak_free(module_region);
+ free_phys(module_region); + free_phys(module_region);
+ else + } else {
+ vfree(module_region); + vfree(module_region);
+ }
+} +}
+ +
+static void *__module_alloc(int size, bool phys) +static void *__module_alloc(int size, bool phys)
@ -269,7 +272,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static int apply_r_mips_none(struct module *me, u32 *location, static int apply_r_mips_none(struct module *me, u32 *location,
u32 base, Elf_Addr v, bool rela) u32 base, Elf_Addr v, bool rela)
@@ -67,9 +274,40 @@ static int apply_r_mips_32(struct module @@ -67,9 +277,40 @@ static int apply_r_mips_32(struct module
return 0; return 0;
} }
@ -310,7 +313,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (v % 4) { if (v % 4) {
pr_err("module %s: dangerous R_MIPS_26 relocation\n", pr_err("module %s: dangerous R_MIPS_26 relocation\n",
me->name); me->name);
@@ -77,13 +315,17 @@ static int apply_r_mips_26(struct module @@ -77,13 +318,17 @@ static int apply_r_mips_26(struct module
} }
if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) { if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
@ -332,7 +335,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
return 0; return 0;
} }
@@ -459,9 +701,36 @@ int module_finalize(const Elf_Ehdr *hdr, @@ -459,9 +704,36 @@ int module_finalize(const Elf_Ehdr *hdr,
list_add(&me->arch.dbe_list, &dbe_list); list_add(&me->arch.dbe_list, &dbe_list);
spin_unlock_irq(&dbe_lock); spin_unlock_irq(&dbe_lock);
} }