Commit 045d599a authored by Dmitry Vyukov's avatar Dmitry Vyukov Committed by Linus Torvalds

kasan: update kasan_global for gcc 7

kasan_global struct is part of compiler/runtime ABI.  gcc revision
241983 has added a new field to kasan_global struct.  Update kernel
definition of kasan_global struct to include the new field.

Without this patch KASAN is broken with gcc 7.

Link: http://lkml.kernel.org/r/1479219743-28682-1-git-send-email-dvyukov@google.comSigned-off-by: default avatarDmitry Vyukov <dvyukov@google.com>
Acked-by: default avatarAndrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: <stable@vger.kernel.org>	[4.0+]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f8ff04e2
...@@ -263,7 +263,9 @@ ...@@ -263,7 +263,9 @@
#endif #endif
#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP && !__CHECKER__ */ #endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP && !__CHECKER__ */
#if GCC_VERSION >= 50000 #if GCC_VERSION >= 70000
#define KASAN_ABI_VERSION 5
#elif GCC_VERSION >= 50000
#define KASAN_ABI_VERSION 4 #define KASAN_ABI_VERSION 4
#elif GCC_VERSION >= 40902 #elif GCC_VERSION >= 40902
#define KASAN_ABI_VERSION 3 #define KASAN_ABI_VERSION 3
......
...@@ -53,6 +53,9 @@ struct kasan_global { ...@@ -53,6 +53,9 @@ struct kasan_global {
#if KASAN_ABI_VERSION >= 4 #if KASAN_ABI_VERSION >= 4
struct kasan_source_location *location; struct kasan_source_location *location;
#endif #endif
#if KASAN_ABI_VERSION >= 5
char *odr_indicator;
#endif
}; };
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment