Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f06e8c58 authored by Dmitry Vyukov's avatar Dmitry Vyukov Committed by Ingo Molnar
Browse files

kasan: Allow kasan_check_read/write() to accept pointers to volatiles 



Currently kasan_check_read/write() accept 'const void*', make them
accept 'const volatile void*'. This is required for instrumentation
of atomic operations and there is just no reason to not allow that.

Signed-off-by: default avatarDmitry Vyukov <dvyukov@google.com>
Reviewed-by: default avatarAndrey Ryabinin <aryabinin@virtuozzo.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: kasan-dev@googlegroups.com
Cc: linux-mm@kvack.org
Cc: will.deacon@arm.com
Link: http://lkml.kernel.org/r/33e5ec275c1ee89299245b2ebbccd63709c6021f.1498140838.git.dvyukov@google.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 25547b6b

include/linux/kasan-checks.h

+6 −4
Original line number Diff line number Diff line
@@ -2,11 +2,13 @@ 
#define _LINUX_KASAN_CHECKS_H



#ifdef CONFIG_KASAN

void kasan_check_read(const void *p, unsigned int size);

void kasan_check_write(const void *p, unsigned int size);

void kasan_check_read(const volatile void *p, unsigned int size);

void kasan_check_write(const volatile void *p, unsigned int size);

#else

static inline void kasan_check_read(const void *p, unsigned int size) { }

static inline void kasan_check_write(const void *p, unsigned int size) { }

static inline void kasan_check_read(const volatile void *p, unsigned int size)

{ }

static inline void kasan_check_write(const volatile void *p, unsigned int size)

{ }

#endif



#endif

mm/kasan/kasan.c

+2 −2
Original line number Diff line number Diff line
@@ -267,13 +267,13 @@ static void check_memory_region(unsigned long addr, 
	check_memory_region_inline(addr, size, write, ret_ip);

}



void kasan_check_read(const void *p, unsigned int size)

void kasan_check_read(const volatile void *p, unsigned int size)

{

	check_memory_region((unsigned long)p, size, false, _RET_IP_);

}

EXPORT_SYMBOL(kasan_check_read);



void kasan_check_write(const void *p, unsigned int size)

void kasan_check_write(const volatile void *p, unsigned int size)

{

	check_memory_region((unsigned long)p, size, true, _RET_IP_);

}