[PATCH V2 02/10] kasan: MODULE_VADDR is not available on all archs

From	"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Newsgroups	linux.kernel
Subject	[PATCH V2 02/10] kasan: MODULE_VADDR is not available on all archs
Date	2015-08-26 10:30 +0200
Message-ID	<q1EfN-gF-35@gated-at.bofh.it> (permalink)
References	<q1EfM-gF-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Conditionalize the check using #ifdef

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

diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index e07c94fbd0ac..71ce7548d914 100644
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -85,9 +85,14 @@ 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 defined(CONFIG_MODULES) && defined(MODULES_VADDR)
+	if (addr >= (void *)MODULES_VADDR
+			&& addr < (void *)MODULES_END)
+		return true;
+#endif
+	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 — Next in thread | Find similar | Unroll thread

Thread

[PATCH V2 02/10] kasan: MODULE_VADDR is not available on all archs "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> - 2015-08-26 10:30 +0200
  Re: [PATCH V2 02/10] kasan: MODULE_VADDR is not available on all archs Andrey Ryabinin <ryabinin.a.a@gmail.com> - 2015-08-26 19:10 +0200
    Re: [PATCH V2 02/10] kasan: MODULE_VADDR is not available on all archs "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> - 2015-08-30 14:40 +0200

csiph-web