Skip to content

Commit

Permalink
mm/kasan: MODULE_VADDR is not available on all archs
Browse files Browse the repository at this point in the history
Use is_module_address instead

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Reviewed-by: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Aneesh Kumar K.V authored and Linus Torvalds committed Nov 6, 2015
1 parent 0ba8663 commit 527f215
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions mm/kasan/report.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <linux/string.h>
#include <linux/types.h>
#include <linux/kasan.h>
#include <linux/module.h>

#include <asm/sections.h>

Expand Down Expand Up @@ -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_address((unsigned long)addr))
return true;
return false;
}

static inline bool init_task_stack_addr(const void *addr)
Expand Down

0 comments on commit 527f215

Please sign in to comment.