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

Groups > linux.kernel > #1668205

[PATCH v4 5/7] kasan: allow kasan_check_read/write() to accept pointers to volatiles

Show all headers | View raw

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: Dmitry Vyukov <dvyukov@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org
Cc: x86@kernel.org
Cc: linux-mm@kvack.org
Cc: kasan-dev@googlegroups.com
---
 include/linux/kasan-checks.h | 10 ++++++----
 mm/kasan/kasan.c             |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/linux/kasan-checks.h b/include/linux/kasan-checks.h
index b7f8aced7870..41960fecf783 100644
--- a/include/linux/kasan-checks.h
+++ b/include/linux/kasan-checks.h
@@ -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
diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c
index c81549d5c833..edacd161c0e5 100644
--- a/mm/kasan/kasan.c
+++ b/mm/kasan/kasan.c
@@ -333,13 +333,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_);
 }
-- 
2.13.1.518.g3df882009-goog

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

Thread

[PATCH v4 0/7] x86, kasan: add KASAN checks to atomic operations Dmitry Vyukov <dvyukov@google.com> - 2017-06-17 11:20 +0200
  [PATCH v4 6/7] asm-generic: add KASAN instrumentation to atomic operations Dmitry Vyukov <dvyukov@google.com> - 2017-06-17 11:20 +0200
    Re: [PATCH v4 6/7] asm-generic: add KASAN instrumentation to atomic  operations Mark Rutland <mark.rutland@arm.com> - 2017-06-19 13:00 +0200
  [PATCH v4 2/7] x86: use s64* for old arg of atomic64_try_cmpxchg() Dmitry Vyukov <dvyukov@google.com> - 2017-06-17 11:20 +0200
  [PATCH v4 4/7] x86: switch atomic.h to use atomic-instrumented.h Dmitry Vyukov <dvyukov@google.com> - 2017-06-17 11:20 +0200
  [PATCH v4 5/7] kasan: allow kasan_check_read/write() to accept pointers to volatiles Dmitry Vyukov <dvyukov@google.com> - 2017-06-17 11:20 +0200
    Re: [PATCH v4 5/7] kasan: allow kasan_check_read/write() to accept  pointers to volatiles Mark Rutland <mark.rutland@arm.com> - 2017-06-19 13:00 +0200
      Re: [PATCH v4 5/7] kasan: allow kasan_check_read/write() to accept  pointers to volatiles Dmitry Vyukov <dvyukov@google.com> - 2017-06-19 15:20 +0200
  [PATCH v4 7/7] asm-generic, x86: add comments for atomic instrumentation Dmitry Vyukov <dvyukov@google.com> - 2017-06-17 11:20 +0200
    Re: [PATCH v4 7/7] asm-generic, x86: add comments for atomic  instrumentation Mark Rutland <mark.rutland@arm.com> - 2017-06-19 13:00 +0200
  [PATCH v4 3/7] asm-generic: add atomic-instrumented.h Dmitry Vyukov <dvyukov@google.com> - 2017-06-17 11:20 +0200
    Re: [PATCH v4 3/7] asm-generic: add atomic-instrumented.h Mark Rutland <mark.rutland@arm.com> - 2017-06-19 13:00 +0200
  [PATCH v4 1/7] x86: un-macro-ify atomic ops implementation Dmitry Vyukov <dvyukov@google.com> - 2017-06-17 11:20 +0200

csiph-web