aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2019-11-06 16:38:43 +0100
committerFelix Fietkau <nbd@nbd.name>2019-12-27 16:08:00 +0100
commit441052f44a19fab38b13c4c31f413bb8a467113f (patch)
treec084cad323f2036559dfe85c8ff27726edd2018c /target
parentd5ede68f8b67f8fa2b4102b90e5dd3722172299a (diff)
downloadupstream-441052f44a19fab38b13c4c31f413bb8a467113f.tar.gz
upstream-441052f44a19fab38b13c4c31f413bb8a467113f.tar.bz2
upstream-441052f44a19fab38b13c4c31f413bb8a467113f.zip
kernel: fix kmemleak warnings introduced in 305-mips_module_reloc.patch
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>
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/pending-4.14/305-mips_module_reloc.patch15
-rw-r--r--target/linux/generic/pending-4.19/305-mips_module_reloc.patch15
2 files changed, 18 insertions, 12 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 609a96db49..f1e07e1726 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,221 @@ struct mips_hi16 {
+@@ -44,14 +44,224 @@ struct mips_hi16 {
static LIST_HEAD(dbe_list);
static DEFINE_SPINLOCK(dbe_lock);
@@ -187,6 +187,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ if (!ptr)
+ return vmalloc(size);
+
++ kmemleak_alloc(ptr, size, 1, GFP_KERNEL);
+ return ptr;
+#endif
}
@@ -203,10 +204,12 @@ 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))
++ if (is_phys_addr(module_region)) {
++ kmemleak_free(module_region);
+ free_phys(module_region);
-+ else
++ } else {
+ vfree(module_region);
++ }
+}
+
+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,
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;
}
@@ -310,7 +313,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 +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)) {
@@ -332,7 +335,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
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);
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 a8e4e78c91..1f98dfd8ef 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,221 @@ struct mips_hi16 {
+@@ -44,14 +44,224 @@ struct mips_hi16 {
static LIST_HEAD(dbe_list);
static DEFINE_SPINLOCK(dbe_lock);
@@ -187,6 +187,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ if (!ptr)
+ return vmalloc(size);
+
++ kmemleak_alloc(ptr, size, 1, GFP_KERNEL);
+ return ptr;
+#endif
}
@@ -203,10 +204,12 @@ 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))
++ if (is_phys_addr(module_region)) {
++ kmemleak_free(module_region);
+ free_phys(module_region);
-+ else
++ } else {
+ vfree(module_region);
++ }
+}
+
+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,
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;
}
@@ -310,7 +313,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 +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)) {
@@ -332,7 +335,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
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);
spin_unlock_irq(&dbe_lock);
}