From patchwork Thu Feb 16 23:45:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Elver X-Patchwork-Id: 58290 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp594436wrn; Thu, 16 Feb 2023 15:53:46 -0800 (PST) X-Google-Smtp-Source: AK7set9GYh+iT7Bgx44Sp3pF9aPkbm8cTkR0o/HT6RhJX6b+UOyMoZqwUdH7wTgR3RbDtjcaZFS1 X-Received: by 2002:a17:903:283:b0:19a:858e:ab9c with SMTP id j3-20020a170903028300b0019a858eab9cmr9108846plr.36.1676591626707; Thu, 16 Feb 2023 15:53:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676591626; cv=none; d=google.com; s=arc-20160816; b=PEtOzUD8n+XTs2cl03W2C1BRmS0kBBaxm+Dadbr/T1T8cVl0680IsiY1po0cKaLICF Aasv55ESF51TpTAaonpDhj1PB8oCmaIwPzXdJ7CRHjiZ4f1ASPQrgQpLZQpWW3iue38X oJYOSm0ArFo42chfmrzY/EgAmgKpC5erGpw6FgzorB8sbdAzWX6imkD+WgKCFH52f/MU df+IqvQv2TmR+2atNX7XdOuxZEZGdHr+LNIZpCHn/VRAFS0VR4CKXU1XeeWDKw5C3Mu6 fQOah9Osp+lvX5qgCZ01KZCdkXHkT1xH09eqXtRF2IDATXlsQdCpTuR8IQOvTkA5oLXC Ub3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=WEP0gdOIpvbUmMDY5eO53Tqx5XD06xr9LMwpgFaq1D0=; b=bXEoUeBFfcPDiUQfyA+tL4XxQblSEzp0bzh5tSuMIsUE15YPApKJfSWvERUd6uMbKr RfwiVkbWWP8H1oWfh35lNGO5/+mZrcOlx/zKo0CJ77DRacIcSrKTznW9Y7ln2aHaSp1Z 88Y63KGpZnJ5g/RCHXaZ5QC7uKUrGnDzdueknMOIYAgnFYS/MS9brY3iK1GA4/dC2XoI vuqkdsRe7ERAqK59MpES8Ow/TklU65qdywv1r9L11DPPTLL4v65EXUwCWzCHKMsNnn2I DSG1Q4n51ShE945H9ie39/Qh07BdpxziDs3uVMxSJjhZ7gnN62ACN3dzPgosvShyNhdB Nrwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=HPdFHv+a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m10-20020a170902db0a00b0019b0fbb9831si1264967plx.635.2023.02.16.15.53.34; Thu, 16 Feb 2023 15:53:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=HPdFHv+a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230144AbjBPXpn (ORCPT + 99 others); Thu, 16 Feb 2023 18:45:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230097AbjBPXpk (ORCPT ); Thu, 16 Feb 2023 18:45:40 -0500 Received: from mail-ed1-x549.google.com (mail-ed1-x549.google.com [IPv6:2a00:1450:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FDBD505E5 for ; Thu, 16 Feb 2023 15:45:38 -0800 (PST) Received: by mail-ed1-x549.google.com with SMTP id b16-20020a056402279000b004ace822b750so3509908ede.20 for ; Thu, 16 Feb 2023 15:45:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=WEP0gdOIpvbUmMDY5eO53Tqx5XD06xr9LMwpgFaq1D0=; b=HPdFHv+aFKSsMbpRelJocXIyNNaSTVp3qtYGElmUkrSvs23G5uEnD+LPzwqpz2nqAX joUBeuv79NzEkPLc7mOxZoqwzVDUX2ycxbzeYQwSktyAJ44NBt7BtMjs+ZUCkCJbBGvh hMjDWAN0oodfC6ZSIMrPXtmSXIRP5wm4Cw2yQhBzH61FP8u0+Aj+P/vCkrSqwC/++qBV M1WDwrfKp3+bR+SMQbvIsRyz719j59IB0w/+Zbj4dTOfA7wrlaGroAwL4HUwMff9vMPe iAK38PEmmHmE2A0T11QxgDCFcAV7XQGZaPSySDNXm41D+0sxrmP2uphiQZZXVvsbIgFn Dkjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=WEP0gdOIpvbUmMDY5eO53Tqx5XD06xr9LMwpgFaq1D0=; b=agTvtP5LP1BJiKlhE5d9rz0q4JzvDnMBn7052x3SdjcPDzrfq4Hc7ihY6DXZTCaFGo UlxdZvkTfhs9lNSxbSITNQCC+cuHhYhFxh5oZRL556FefhALneVCP8ZGUZEXDov8A9kR FD0DA8tpIqDJk4c6pGvo7xxOacNpUARsOBT57iIKps7cumR8HqWY7dFICn4I2tkYsC1C x65+fbjKusJUu12ViLpoVV6yBcRMLBL42k9JjENbn2H+gfupnV43KKfjBtln1qkZQ7HS 41Kq9rVo/eMMBe3SooUVw7HjaAONbYMrvmdmF0MK9jJ4m72VZdEzo0TdnqhOjHihSbM6 wPkg== X-Gm-Message-State: AO0yUKXn3FLG/24TAcQUK3+yzAJFyDNHkptvR25oN8lZ4QjAPx08is9w 9pXiHyz5WuG5gdvftQfPe3/5LC4qJw== X-Received: from elver.muc.corp.google.com ([2a00:79e0:9c:201:34a3:b9c:4ef:ef85]) (user=elver job=sendgmr) by 2002:a05:6402:2485:b0:4ad:739c:b38e with SMTP id q5-20020a056402248500b004ad739cb38emr1528006eda.1.1676591136985; Thu, 16 Feb 2023 15:45:36 -0800 (PST) Date: Fri, 17 Feb 2023 00:45:21 +0100 In-Reply-To: <20230216234522.3757369-1-elver@google.com> Mime-Version: 1.0 References: <20230216234522.3757369-1-elver@google.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Message-ID: <20230216234522.3757369-2-elver@google.com> Subject: [PATCH -tip v4 2/3] kasan: Treat meminstrinsic as builtins in uninstrumented files From: Marco Elver To: elver@google.com, Peter Zijlstra Cc: Ingo Molnar , Jakub Jelinek , linux-toolchains@vger.kernel.org, Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Andrew Morton , Nathan Chancellor , Nick Desaulniers , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758033741162823264?= X-GMAIL-MSGID: =?utf-8?q?1758033741162823264?= Where the compiler instruments meminstrinsics by generating calls to __asan/__hwasan_ prefixed functions, let the compiler consider memintrinsics as builtin again. To do so, never override memset/memmove/memcpy if the compiler does the correct instrumentation - even on !GENERIC_ENTRY architectures. Fixes: 69d4c0d32186 ("entry, kasan, x86: Disallow overriding mem*() functions") Signed-off-by: Marco Elver Reviewed-by: Andrey Konovalov --- v4: * New patch. --- lib/Kconfig.kasan | 9 +++++++++ mm/kasan/shadow.c | 5 ++++- scripts/Makefile.kasan | 9 +++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index be6ee6020290..fdca89c05745 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -49,6 +49,15 @@ menuconfig KASAN if KASAN +config CC_HAS_KASAN_MEMINTRINSIC_PREFIX + def_bool (CC_IS_CLANG && $(cc-option,-fsanitize=kernel-address -mllvm -asan-kernel-mem-intrinsic-prefix=1)) || \ + (CC_IS_GCC && $(cc-option,-fsanitize=kernel-address --param asan-kernel-mem-intrinsic-prefix=1)) + # Don't define it if we don't need it: compilation of the test uses + # this variable to decide how the compiler should treat builtins. + depends on !KASAN_HW_TAGS + help + The compiler is able to prefix memintrinsics with __asan or __hwasan. + choice prompt "KASAN mode" default KASAN_GENERIC diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c index f8a47cb299cb..43b6a59c8b54 100644 --- a/mm/kasan/shadow.c +++ b/mm/kasan/shadow.c @@ -38,11 +38,14 @@ bool __kasan_check_write(const volatile void *p, unsigned int size) } EXPORT_SYMBOL(__kasan_check_write); -#ifndef CONFIG_GENERIC_ENTRY +#if !defined(CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX) && !defined(CONFIG_GENERIC_ENTRY) /* * CONFIG_GENERIC_ENTRY relies on compiler emitted mem*() calls to not be * instrumented. KASAN enabled toolchains should emit __asan_mem*() functions * for the sites they want to instrument. + * + * If we have a compiler that can instrument meminstrinsics, never override + * these, so that non-instrumented files can safely consider them as builtins. */ #undef memset void *memset(void *addr, int c, size_t len) diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan index fa9f836f8039..c186110ffa20 100644 --- a/scripts/Makefile.kasan +++ b/scripts/Makefile.kasan @@ -1,5 +1,14 @@ # SPDX-License-Identifier: GPL-2.0 + +ifdef CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX +# Safe for compiler to generate meminstrinsic calls in uninstrumented files. +CFLAGS_KASAN_NOSANITIZE := +else +# Don't let compiler generate memintrinsic calls in uninstrumented files +# because they are instrumented. CFLAGS_KASAN_NOSANITIZE := -fno-builtin +endif + KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET) cc-param = $(call cc-option, -mllvm -$(1), $(call cc-option, --param $(1)))