Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 22:50:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kasan: update kasan_global for gcc 7

Browse Source 
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.com
Signed-off-by: Dmitry Vyukov <dvyukov@google.com>
Acked-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: <stable@vger.kernel.org>	[4.0+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Dmitry Vyukov 2016-11-30 15:54:13 -08:00 committed by Linus Torvalds
parent f8ff04e2be
commit 045d599a28
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/compiler-gcc.h
View File

@ -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

3
mm/kasan/kasan.h
View File

@ -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
}; };
/** /**