From: Linus Torvalds Date: Tue, 22 Dec 2020 21:38:17 +0000 (-0800) Subject: Merge branch 'akpm' (patches from Andrew) X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=1375b9803e007842493c64d0d73d7dd0e385e17c;p=kernel.git Merge branch 'akpm' (patches from Andrew) Merge KASAN updates from Andrew Morton. This adds a new hardware tag-based mode to KASAN. The new mode is similar to the existing software tag-based KASAN, but relies on arm64 Memory Tagging Extension (MTE) to perform memory and pointer tagging (instead of shadow memory and compiler instrumentation). By Andrey Konovalov and Vincenzo Frascino. * emailed patches from Andrew Morton : (60 commits) kasan: update documentation kasan, mm: allow cache merging with no metadata kasan: sanitize objects when metadata doesn't fit kasan: clarify comment in __kasan_kfree_large kasan: simplify assign_tag and set_tag calls kasan: don't round_up too much kasan, mm: rename kasan_poison_kfree kasan, mm: check kasan_enabled in annotations kasan: add and integrate kasan boot parameters kasan: inline (un)poison_range and check_invalid_free kasan: open-code kasan_unpoison_slab kasan: inline random_tag for HW_TAGS kasan: inline kasan_reset_tag for tag-based modes kasan: remove __kasan_unpoison_stack kasan: allow VMAP_STACK for HW_TAGS mode kasan, arm64: unpoison stack only with CONFIG_KASAN_STACK kasan: introduce set_alloc_info kasan: rename get_alloc/free_info kasan: simplify quarantine_put call site kselftest/arm64: check GCR_EL1 after context switch ... --- 1375b9803e007842493c64d0d73d7dd0e385e17c diff --cc Documentation/dev-tools/kasan.rst index 748149bca8d87,e03513f6b0790..0fc3fb1860c4a --- a/Documentation/dev-tools/kasan.rst +++ b/Documentation/dev-tools/kasan.rst @@@ -18,8 -21,8 +21,8 @@@ out-of-bounds accesses for global varia Tag-based KASAN is only supported in Clang. -Currently generic KASAN is supported for the x86_64, arm64, xtensa, s390 and +Currently generic KASAN is supported for the x86_64, arm, arm64, xtensa, s390 - and riscv architectures, and tag-based KASAN is supported only for arm64. + and riscv architectures, and tag-based KASAN modes are supported only for arm64. Usage -----