Re: [PATCH v4 6/7] asm-generic: add KASAN instrumentation to atomic operations

From: Mark Rutland
Date: Mon Jun 19 2017 - 06:52:27 EST

Next message: Wei Xu: "Re: [PATCH v11 1/3] PCI: hisi: Add DT binding for PCIe of Kirin SoC series"
Previous message: Mark Rutland: "Re: [PATCH v4 3/7] asm-generic: add atomic-instrumented.h"
In reply to: Dmitry Vyukov: "[PATCH v4 6/7] asm-generic: add KASAN instrumentation to atomic operations"
Next in thread: Dmitry Vyukov: "[PATCH v4 5/7] kasan: allow kasan_check_read/write() to accept pointers to volatiles"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On Sat, Jun 17, 2017 at 11:15:32AM +0200, Dmitry Vyukov wrote:
> KASAN uses compiler instrumentation to intercept all memory accesses.
> But it does not see memory accesses done in assembly code.
> One notable user of assembly code is atomic operations. Frequently,
> for example, an atomic reference decrement is the last access to an
> object and a good candidate for a racy use-after-free.
>
> Add manual KASAN checks to atomic operations.
>
> Signed-off-by: Dmitry Vyukov <dvyukov@xxxxxxxxxx>
> Cc: Mark Rutland <mark.rutland@xxxxxxx>
> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> Cc: Will Deacon <will.deacon@xxxxxxx>,
> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>,
> Cc: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx>,
> Cc: Ingo Molnar <mingo@xxxxxxxxxx>,
> Cc: kasan-dev@xxxxxxxxxxxxxxxx
> Cc: linux-mm@xxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> Cc: x86@xxxxxxxxxx

FWIW:

Acked-by: Mark Rutland <mark.rutland@xxxxxxx>

Mark.

> ---
> include/asm-generic/atomic-instrumented.h | 76 +++++++++++++++++++++++++++++--
> 1 file changed, 72 insertions(+), 4 deletions(-)
>
> diff --git a/include/asm-generic/atomic-instrumented.h b/include/asm-generic/atomic-instrumented.h
> index 50401d925290..a0f5b7525bb2 100644
> --- a/include/asm-generic/atomic-instrumented.h
> +++ b/include/asm-generic/atomic-instrumented.h
> @@ -1,43 +1,53 @@
> #ifndef _LINUX_ATOMIC_INSTRUMENTED_H
> #define _LINUX_ATOMIC_INSTRUMENTED_H
>
> +#include <linux/kasan-checks.h>
> +
> static __always_inline int atomic_read(const atomic_t *v)
> {
> + kasan_check_read(v, sizeof(*v));
> return arch_atomic_read(v);
> }
>
> static __always_inline s64 atomic64_read(const atomic64_t *v)
> {
> + kasan_check_read(v, sizeof(*v));
> return arch_atomic64_read(v);
> }
>
> static __always_inline void atomic_set(atomic_t *v, int i)
> {
> + kasan_check_write(v, sizeof(*v));
> arch_atomic_set(v, i);
> }
>
> static __always_inline void atomic64_set(atomic64_t *v, s64 i)
> {
> + kasan_check_write(v, sizeof(*v));
> arch_atomic64_set(v, i);
> }
>
> static __always_inline int atomic_xchg(atomic_t *v, int i)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic_xchg(v, i);
> }
>
> static __always_inline s64 atomic64_xchg(atomic64_t *v, s64 i)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_xchg(v, i);
> }
>
> static __always_inline int atomic_cmpxchg(atomic_t *v, int old, int new)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic_cmpxchg(v, old, new);
> }
>
> static __always_inline s64 atomic64_cmpxchg(atomic64_t *v, s64 old, s64 new)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_cmpxchg(v, old, new);
> }
>
> @@ -45,6 +55,8 @@ static __always_inline s64 atomic64_cmpxchg(atomic64_t *v, s64 old, s64 new)
> #define atomic_try_cmpxchg atomic_try_cmpxchg
> static __always_inline bool atomic_try_cmpxchg(atomic_t *v, int *old, int new)
> {
> + kasan_check_write(v, sizeof(*v));
> + kasan_check_read(old, sizeof(*old));
> return arch_atomic_try_cmpxchg(v, old, new);
> }
> #endif
> @@ -53,254 +65,310 @@ static __always_inline bool atomic_try_cmpxchg(atomic_t *v, int *old, int new)
> #define atomic64_try_cmpxchg atomic64_try_cmpxchg
> static __always_inline bool atomic64_try_cmpxchg(atomic64_t *v, s64 *old, s64 new)
> {
> + kasan_check_write(v, sizeof(*v));
> + kasan_check_read(old, sizeof(*old));
> return arch_atomic64_try_cmpxchg(v, old, new);
> }
> #endif
>
> static __always_inline int __atomic_add_unless(atomic_t *v, int a, int u)
> {
> + kasan_check_write(v, sizeof(*v));
> return __arch_atomic_add_unless(v, a, u);
> }
>
>
> static __always_inline bool atomic64_add_unless(atomic64_t *v, s64 a, s64 u)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_add_unless(v, a, u);
> }
>
> static __always_inline void atomic_inc(atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> arch_atomic_inc(v);
> }
>
> static __always_inline void atomic64_inc(atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> arch_atomic64_inc(v);
> }
>
> static __always_inline void atomic_dec(atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> arch_atomic_dec(v);
> }
>
> static __always_inline void atomic64_dec(atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> arch_atomic64_dec(v);
> }
>
> static __always_inline void atomic_add(int i, atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> arch_atomic_add(i, v);
> }
>
> static __always_inline void atomic64_add(s64 i, atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> arch_atomic64_add(i, v);
> }
>
> static __always_inline void atomic_sub(int i, atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> arch_atomic_sub(i, v);
> }
>
> static __always_inline void atomic64_sub(s64 i, atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> arch_atomic64_sub(i, v);
> }
>
> static __always_inline void atomic_and(int i, atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> arch_atomic_and(i, v);
> }
>
> static __always_inline void atomic64_and(s64 i, atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> arch_atomic64_and(i, v);
> }
>
> static __always_inline void atomic_or(int i, atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> arch_atomic_or(i, v);
> }
>
> static __always_inline void atomic64_or(s64 i, atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> arch_atomic64_or(i, v);
> }
>
> static __always_inline void atomic_xor(int i, atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> arch_atomic_xor(i, v);
> }
>
> static __always_inline void atomic64_xor(s64 i, atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> arch_atomic64_xor(i, v);
> }
>
> static __always_inline int atomic_inc_return(atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic_inc_return(v);
> }
>
> static __always_inline s64 atomic64_inc_return(atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_inc_return(v);
> }
>
> static __always_inline int atomic_dec_return(atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic_dec_return(v);
> }
>
> static __always_inline s64 atomic64_dec_return(atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_dec_return(v);
> }
>
> static __always_inline s64 atomic64_inc_not_zero(atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_inc_not_zero(v);
> }
>
> static __always_inline s64 atomic64_dec_if_positive(atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_dec_if_positive(v);
> }
>
> static __always_inline bool atomic_dec_and_test(atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic_dec_and_test(v);
> }
>
> static __always_inline bool atomic64_dec_and_test(atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_dec_and_test(v);
> }
>
> static __always_inline bool atomic_inc_and_test(atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic_inc_and_test(v);
> }
>
> static __always_inline bool atomic64_inc_and_test(atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_inc_and_test(v);
> }
>
> static __always_inline int atomic_add_return(int i, atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic_add_return(i, v);
> }
>
> static __always_inline s64 atomic64_add_return(s64 i, atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_add_return(i, v);
> }
>
> static __always_inline int atomic_sub_return(int i, atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic_sub_return(i, v);
> }
>
> static __always_inline s64 atomic64_sub_return(s64 i, atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_sub_return(i, v);
> }
>
> static __always_inline int atomic_fetch_add(int i, atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic_fetch_add(i, v);
> }
>
> static __always_inline s64 atomic64_fetch_add(s64 i, atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_fetch_add(i, v);
> }
>
> static __always_inline int atomic_fetch_sub(int i, atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic_fetch_sub(i, v);
> }
>
> static __always_inline s64 atomic64_fetch_sub(s64 i, atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_fetch_sub(i, v);
> }
>
> static __always_inline int atomic_fetch_and(int i, atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic_fetch_and(i, v);
> }
>
> static __always_inline s64 atomic64_fetch_and(s64 i, atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_fetch_and(i, v);
> }
>
> static __always_inline int atomic_fetch_or(int i, atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic_fetch_or(i, v);
> }
>
> static __always_inline s64 atomic64_fetch_or(s64 i, atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_fetch_or(i, v);
> }
>
> static __always_inline int atomic_fetch_xor(int i, atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic_fetch_xor(i, v);
> }
>
> static __always_inline s64 atomic64_fetch_xor(s64 i, atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_fetch_xor(i, v);
> }
>
> static __always_inline bool atomic_sub_and_test(int i, atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic_sub_and_test(i, v);
> }
>
> static __always_inline bool atomic64_sub_and_test(s64 i, atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_sub_and_test(i, v);
> }
>
> static __always_inline bool atomic_add_negative(int i, atomic_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic_add_negative(i, v);
> }
>
> static __always_inline bool atomic64_add_negative(s64 i, atomic64_t *v)
> {
> + kasan_check_write(v, sizeof(*v));
> return arch_atomic64_add_negative(i, v);
> }
>
> #define cmpxchg(ptr, old, new) \
> ({ \
> + __typeof__(ptr) ___ptr = (ptr); \
> + kasan_check_write(___ptr, sizeof(*___ptr)); \
> arch_cmpxchg((ptr), (old), (new)); \
> })
>
> #define sync_cmpxchg(ptr, old, new) \
> ({ \
> - arch_sync_cmpxchg((ptr), (old), (new)); \
> + __typeof__(ptr) ___ptr = (ptr); \
> + kasan_check_write(___ptr, sizeof(*___ptr)); \
> + arch_sync_cmpxchg(___ptr, (old), (new)); \
> })
>
> #define cmpxchg_local(ptr, old, new) \
> ({ \
> - arch_cmpxchg_local((ptr), (old), (new)); \
> + __typeof__(ptr) ____ptr = (ptr); \
> + kasan_check_write(____ptr, sizeof(*____ptr)); \
> + arch_cmpxchg_local(____ptr, (old), (new)); \
> })
>
> #define cmpxchg64(ptr, old, new) \
> ({ \
> - arch_cmpxchg64((ptr), (old), (new)); \
> + __typeof__(ptr) ____ptr = (ptr); \
> + kasan_check_write(____ptr, sizeof(*____ptr)); \
> + arch_cmpxchg64(____ptr, (old), (new)); \
> })
>
> #define cmpxchg64_local(ptr, old, new) \
> ({ \
> - arch_cmpxchg64_local((ptr), (old), (new)); \
> + __typeof__(ptr) ____ptr = (ptr); \
> + kasan_check_write(____ptr, sizeof(*____ptr)); \
> + arch_cmpxchg64_local(____ptr, (old), (new)); \
> })
>
> #define cmpxchg_double(p1, p2, o1, o2, n1, n2) \
> --
> 2.13.1.518.g3df882009-goog
>

Next message: Wei Xu: "Re: [PATCH v11 1/3] PCI: hisi: Add DT binding for PCIe of Kirin SoC series"
Previous message: Mark Rutland: "Re: [PATCH v4 3/7] asm-generic: add atomic-instrumented.h"
In reply to: Dmitry Vyukov: "[PATCH v4 6/7] asm-generic: add KASAN instrumentation to atomic operations"
Next in thread: Dmitry Vyukov: "[PATCH v4 5/7] kasan: allow kasan_check_read/write() to accept pointers to volatiles"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]