lkml.org 
[lkml]   [2017]   [May]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 5/7] kasan: allow kasan_check_read/write() to accept pointers to volatiles
    Date
    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 98b27195e38b..db46e66eb1d4 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.0.219.gdb65acc882-goog
    \
     
     \ /
      Last update: 2017-05-26 21:11    [W:2.273 / U:0.668 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site