681e57bb08
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlt3GxIACgkQONu9yGCS aT6TqQ//bFz4bs9vR+oqFF0Q8kuGMsEWiYMRFGPqgpvpSAN2DXHEPhWV6FElQKfN QsAhwHtAEzEW2vZhD/r7m3ASOFJYLmLx+h6EmiM0FmMhmTbK/jFhjuLTbzRWOU3P zSfhLb+Gfb3IvE0WOulFweiauncIwlIiZVwf5l7kX84JOrzMLJoZMwbvTGlQolWU 2LEkvMFxwPI5md+ry8hHlcVMVoV1NIsEzfk9Tj8ExV5PKt8qN/k1Iht9GOhgKmGP hjiU011Udgp579msWyg1h/9UekT4uW8Obf5kTURWwTMoVaCIq6lZAWs1wdni7e1T Z105VFBlSvGQjL4CxZyqftWQV6YqH66ORYn/Ohl13iSYBLttQ+HXVNKAmo1SYjji 2fsEcAVl7bv4n3l+g3UHf8P+6QQBvgs8p0+CR6bur4zpUlX8jH1OyasXp1tmks1F aQGGEzbsRrVFymTuHoljWOxLVYvtzK0W9wP/ZSNDZZiEfwMkKZmC0/czBaJeIU1t 3Qcfm/dVxAcXZV0CYaJqXx7ByEtVdWwOEXoG9j1ul6ODpMyxvaLW6XsxZ2y1iV19 TzTp//v73VkEuTM+ngj+1xkBfO9cGiKJLWCsgEOm2+0Wj3JtzoEa64DgQZq9/c97 NaJWqG8JdrFa8ceTOPIDNwHuilRah19EP5oxfBVuHRwOJViyPks= =K8nm -----END PGP SIGNATURE----- Merge 4.9.121 into android-4.9 Changes in 4.9.121 x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled x86: i8259: Add missing include file x86/mm: Disable ioremap free page handling on x86-PAE kasan: don't emit builtin calls when sanitization is off i2c: ismt: fix wrong device address when unmap the data buffer kbuild: verify that $DEPMOD is installed crypto: x86/sha256-mb - fix digest copy in sha256_mb_mgr_get_comp_job_avx2() crypto: vmac - require a block cipher with 128-bit block size crypto: vmac - separate tfm and request context crypto: blkcipher - fix crash flushing dcache in error path crypto: ablkcipher - fix crash flushing dcache in error path ASoC: Intel: cht_bsw_max98090_ti: Fix jack initialization Bluetooth: hidp: buffer overflow in hidp_process_report ioremap: Update pgtable free interfaces with addr x86/mm: Add TLB purge to free pmd/pte page interfaces Linux 4.9.121 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
42 lines
1.3 KiB
Text
42 lines
1.3 KiB
Text
ifdef CONFIG_KASAN
|
|
ifdef CONFIG_KASAN_INLINE
|
|
call_threshold := 10000
|
|
else
|
|
call_threshold := 0
|
|
endif
|
|
|
|
KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET)
|
|
|
|
CFLAGS_KASAN_MINIMAL := -fsanitize=kernel-address
|
|
|
|
cc-param = $(call cc-option, -mllvm -$(1), $(call cc-option, --param $(1)))
|
|
|
|
ifeq ($(call cc-option, $(CFLAGS_KASAN_MINIMAL) -Werror),)
|
|
ifneq ($(CONFIG_COMPILE_TEST),y)
|
|
$(warning Cannot use CONFIG_KASAN: \
|
|
-fsanitize=kernel-address is not supported by compiler)
|
|
endif
|
|
else
|
|
# -fasan-shadow-offset fails without -fsanitize
|
|
CFLAGS_KASAN_SHADOW := $(call cc-option, -fsanitize=kernel-address \
|
|
-fasan-shadow-offset=$(KASAN_SHADOW_OFFSET), \
|
|
$(call cc-option, -fsanitize=kernel-address \
|
|
-mllvm -asan-mapping-offset=$(KASAN_SHADOW_OFFSET)))
|
|
|
|
ifeq ($(strip $(CFLAGS_KASAN_SHADOW)),)
|
|
CFLAGS_KASAN := $(CFLAGS_KASAN_MINIMAL)
|
|
else
|
|
# Now add all the compiler specific options that are valid standalone
|
|
CFLAGS_KASAN := $(CFLAGS_KASAN_SHADOW) \
|
|
$(call cc-param,asan-globals=1) \
|
|
$(call cc-param,asan-instrumentation-with-call-threshold=$(call_threshold)) \
|
|
$(call cc-param,asan-stack=1) \
|
|
$(call cc-param,asan-use-after-scope=1) \
|
|
$(call cc-param,asan-instrument-allocas=1)
|
|
endif
|
|
|
|
endif
|
|
|
|
CFLAGS_KASAN_NOSANITIZE := -fno-builtin
|
|
|
|
endif
|