Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1218084

[PATCH 2/4] kasan: MODULE_VADDR is not available on all archs

Show all headers | View raw

Use is_module_text_address instead

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
 mm/kasan/report.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index 6c3f82b0240b..01d2efec8ea4 100644
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -22,6 +22,7 @@
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/kasan.h>
+#include <linux/module.h>
 
 #include <asm/sections.h>
 
@@ -85,9 +86,11 @@ static void print_error_description(struct kasan_access_info *info)
 
 static inline bool kernel_or_module_addr(const void *addr)
 {
-	return (addr >= (void *)_stext && addr < (void *)_end)
-		|| (addr >= (void *)MODULES_VADDR
-			&& addr < (void *)MODULES_END);
+	if (addr >= (void *)_stext && addr < (void *)_end)
+		return true;
+	if (is_module_text_address((unsigned long)addr))
+		return true;
+	return false;
 }
 
 static inline bool init_task_stack_addr(const void *addr)
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/4] kasan: Rename kasan_enabled to kasan_report_enabled "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> - 2015-09-03 10:00 +0200
  [PATCH 2/4] kasan: MODULE_VADDR is not available on all archs "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> - 2015-09-03 10:00 +0200
    Re: [PATCH 2/4] kasan: MODULE_VADDR is not available on all archs Andrey Ryabinin <ryabinin.a.a@gmail.com> - 2015-09-03 10:30 +0200
  [PATCH 4/4] kasan: Prevent deadlock in kasan reporting "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> - 2015-09-03 10:00 +0200
    Re: [PATCH 4/4] kasan: Prevent deadlock in kasan reporting Andrey Ryabinin <ryabinin.a.a@gmail.com> - 2015-09-03 11:20 +0200
  [PATCH 3/4] kasan: Don't use kasan shadow pointer in generic functions "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> - 2015-09-03 10:00 +0200
    Re: [PATCH 3/4] kasan: Don't use kasan shadow pointer in generic  functions Andrey Ryabinin <ryabinin.a.a@gmail.com> - 2015-09-03 10:50 +0200

csiph-web