From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 655B4C64ED6 for ; Sun, 26 Feb 2023 05:03:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229565AbjBZFDo (ORCPT ); Sun, 26 Feb 2023 00:03:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229445AbjBZFDn (ORCPT ); Sun, 26 Feb 2023 00:03:43 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A89212857 for ; Sat, 25 Feb 2023 21:03:42 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8CC9860BE9 for ; Sun, 26 Feb 2023 05:03:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CFC98C433D2; Sun, 26 Feb 2023 05:03:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1677387820; bh=Ae4Mt+ImA1poX4DGY29+eNNHDuUQU5MSwF+qh5QvoHU=; h=Date:To:From:Subject:From; b=rHvDJC0CkBSMRStyXkcfyH4UlRRGjs2X9AjEeKD8YeyG7YLQ598KLzXOpkA3GkTcI lpcb6f/utnKd4agwOLsYAtX2rkOGchEwaBJJFh3kdJa5idYtzsQTtlMGfeqfLMwh9A C0qSJv1lTWi17x6ZpcUdfc0PWeD4rtAGsBHJDjMw= Date: Sat, 25 Feb 2023 21:03:40 -0800 To: mm-commits@vger.kernel.org, vincenzo.frascino@arm.com, tglx@linutronix.de, ryabinin.a.a@gmail.com, peterz@infradead.org, nicolas@fjasle.eu, ndesaulniers@google.com, nathan@kernel.org, naresh.kamboju@linaro.org, mingo@redhat.com, lkft@linaro.org, keescook@chromium.org, jakub@redhat.com, glider@google.com, dvyukov@google.com, dave.hansen@linux.intel.com, bp@alien8.de, andreyknvl@gmail.com, elver@google.com, akpm@linux-foundation.org From: Andrew Morton Subject: + kasan-emit-different-calls-for-instrumentable-memintrinsics.patch added to mm-hotfixes-unstable branch Message-Id: <20230226050340.CFC98C433D2@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: kasan: emit different calls for instrumentable memintrinsics has been added to the -mm mm-hotfixes-unstable branch. Its filename is kasan-emit-different-calls-for-instrumentable-memintrinsics.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/kasan-emit-different-calls-for-instrumentable-memintrinsics.patch This patch will later appear in the mm-hotfixes-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Marco Elver Subject: kasan: emit different calls for instrumentable memintrinsics Date: Fri, 24 Feb 2023 09:59:39 +0100 Clang 15 provides an option to prefix memcpy/memset/memmove calls with __asan_/__hwasan_ in instrumented functions: https://reviews.llvm.org/D122724 GCC will add support in future: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108777 Use it to regain KASAN instrumentation of memcpy/memset/memmove on architectures that require noinstr to be really free from instrumented mem*() functions (all GENERIC_ENTRY architectures). Link: https://lkml.kernel.org/r/20230224085942.1791837-1-elver@google.com Fixes: 69d4c0d32186 ("entry, kasan, x86: Disallow overriding mem*() functions") Signed-off-by: Marco Elver Acked-by: Peter Zijlstra (Intel) Reviewed-by: Andrey Konovalov Tested-by: Linux Kernel Functional Testing Tested-by: Naresh Kamboju Cc: Alexander Potapenko Cc: Andrey Ryabinin Cc: Borislav Petkov (AMD) Cc: Dave Hansen Cc: Dmitry Vyukov Cc: Ingo Molnar Cc: Jakub Jelinek Cc: kasan-dev@googlegroups.com Cc: Kees Cook Cc: Linux Kernel Functional Testing Cc: Nathan Chancellor # build only Cc: Nick Desaulniers Cc: Nicolas Schier Cc: Thomas Gleixner Cc: Vincenzo Frascino Signed-off-by: Andrew Morton --- --- a/mm/kasan/kasan.h~kasan-emit-different-calls-for-instrumentable-memintrinsics +++ b/mm/kasan/kasan.h @@ -666,4 +666,8 @@ void __hwasan_storeN_noabort(unsigned long addr, size_t size); void __hwasan_tag_memory(unsigned long addr, u8 tag, unsigned long size); +void *__hwasan_memset(void *addr, int c, size_t len); +void *__hwasan_memmove(void *dest, const void *src, size_t len); +void *__hwasan_memcpy(void *dest, const void *src, size_t len); + #endif /* __MM_KASAN_KASAN_H */ --- a/mm/kasan/shadow.c~kasan-emit-different-calls-for-instrumentable-memintrinsics +++ b/mm/kasan/shadow.c @@ -107,6 +107,17 @@ void *__asan_memcpy(void *dest, const void *src, size_t len) } EXPORT_SYMBOL(__asan_memcpy); +#ifdef CONFIG_KASAN_SW_TAGS +void *__hwasan_memset(void *addr, int c, size_t len) __alias(__asan_memset); +EXPORT_SYMBOL(__hwasan_memset); +#ifdef __HAVE_ARCH_MEMMOVE +void *__hwasan_memmove(void *dest, const void *src, size_t len) __alias(__asan_memmove); +EXPORT_SYMBOL(__hwasan_memmove); +#endif +void *__hwasan_memcpy(void *dest, const void *src, size_t len) __alias(__asan_memcpy); +EXPORT_SYMBOL(__hwasan_memcpy); +#endif + void kasan_poison(const void *addr, size_t size, u8 value, bool init) { void *shadow_start, *shadow_end; --- a/scripts/Makefile.kasan~kasan-emit-different-calls-for-instrumentable-memintrinsics +++ b/scripts/Makefile.kasan @@ -38,6 +38,11 @@ endif CFLAGS_KASAN += $(call cc-param,asan-stack=$(stack_enable)) +# Instrument memcpy/memset/memmove calls by using instrumented __asan_mem*() +# instead. With compilers that don't support this option, compiler-inserted +# memintrinsics won't be checked by KASAN on GENERIC_ENTRY architectures. +CFLAGS_KASAN += $(call cc-param,asan-kernel-mem-intrinsic-prefix=1) + endif # CONFIG_KASAN_GENERIC ifdef CONFIG_KASAN_SW_TAGS @@ -54,6 +59,9 @@ CFLAGS_KASAN := -fsanitize=kernel-hwaddress \ $(call cc-param,hwasan-inline-all-checks=0) \ $(instrumentation_flags) +# Instrument memcpy/memset/memmove calls by using instrumented __hwasan_mem*(). +CFLAGS_KASAN += $(call cc-param,hwasan-kernel-mem-intrinsic-prefix=1) + endif # CONFIG_KASAN_SW_TAGS export CFLAGS_KASAN CFLAGS_KASAN_NOSANITIZE _ Patches currently in -mm which might be from elver@google.com are kasan-emit-different-calls-for-instrumentable-memintrinsics.patch kasan-treat-meminstrinsic-as-builtins-in-uninstrumented-files.patch kasan-test-fix-test-for-new-meminstrinsic-instrumentation.patch kasan-x86-dont-rename-memintrinsics-in-uninstrumented-files.patch