--- /dev/null
+From c5caf21ab0cf884ef15b25af234f620e4a233139 Mon Sep 17 00:00:00 2001
+From: Andrey Ryabinin <aryabinin@virtuozzo.com>
+Date: Mon, 12 Dec 2016 16:44:59 -0800
+Subject: kasan: turn on -fsanitize-address-use-after-scope
+
+From: Andrey Ryabinin <aryabinin@virtuozzo.com>
+
+commit c5caf21ab0cf884ef15b25af234f620e4a233139 upstream.
+
+In the upcoming gcc7 release, the -fsanitize=kernel-address option at
+first implied new -fsanitize-address-use-after-scope option. This would
+cause link errors on older kernels because they don't have two new
+functions required for use-after-scope support. Therefore, gcc7 changed
+default to -fno-sanitize-address-use-after-scope.
+
+Now the kernel has everything required for that feature since commit
+828347f8f9a5 ("kasan: support use-after-scope detection"). So, to make it
+work, we just have to enable use-after-scope in CFLAGS.
+
+Link: http://lkml.kernel.org/r/1481207977-28654-1-git-send-email-aryabinin@virtuozzo.com
+Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
+Acked-by: Dmitry Vyukov <dvyukov@google.com>
+Cc: Alexander Potapenko <glider@google.com>
+Cc: Andrey Konovalov <andreyknvl@google.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Nick Desaulniers <ndesaulniers@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ scripts/Makefile.kasan | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/scripts/Makefile.kasan
++++ b/scripts/Makefile.kasan
+@@ -28,4 +28,6 @@ else
+ CFLAGS_KASAN := $(CFLAGS_KASAN_MINIMAL)
+ endif
+ endif
++
++CFLAGS_KASAN += $(call cc-option, -fsanitize-address-use-after-scope)
+ endif