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: 13144150 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B8ECC61DA4 for ; Thu, 16 Feb 2023 23:45:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D86216B0072; Thu, 16 Feb 2023 18:45:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D0D596B0074; Thu, 16 Feb 2023 18:45:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BAE806B0075; Thu, 16 Feb 2023 18:45:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id AC15D6B0072 for ; Thu, 16 Feb 2023 18:45:40 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 7720941204 for ; Thu, 16 Feb 2023 23:45:40 +0000 (UTC) X-FDA: 80474789640.03.8892B58 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.74]) by imf16.hostedemail.com (Postfix) with ESMTP id A7D4C18000C for ; Thu, 16 Feb 2023 23:45:38 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=HPdFHv+a; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf16.hostedemail.com: domain of 3IMDuYwUKCIEjq0jwlttlqj.htrqnsz2-rrp0fhp.twl@flex--elver.bounces.google.com designates 209.85.208.74 as permitted sender) smtp.mailfrom=3IMDuYwUKCIEjq0jwlttlqj.htrqnsz2-rrp0fhp.twl@flex--elver.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676591138; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=WEP0gdOIpvbUmMDY5eO53Tqx5XD06xr9LMwpgFaq1D0=; b=Rn8B/EGeMcvbXCOnfCx14/MoFUy9ij+JrC6dVF6QxvGdOSAJqdPRIWXco1XZZGbWlo/vNN g0hWjtP6qtnlYbbmySSilYlylZ4Fo5RRuY/KFy24OE9ueQAZTlRZHFVeN+NKnnJI+tFJEQ EXdgDuTDUQm0t5M86/SSf3p58NtnNv8= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=HPdFHv+a; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf16.hostedemail.com: domain of 3IMDuYwUKCIEjq0jwlttlqj.htrqnsz2-rrp0fhp.twl@flex--elver.bounces.google.com designates 209.85.208.74 as permitted sender) smtp.mailfrom=3IMDuYwUKCIEjq0jwlttlqj.htrqnsz2-rrp0fhp.twl@flex--elver.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676591138; a=rsa-sha256; cv=none; b=Vdh8kMOq/p44DJzyhz5ID8ysudz5aYl8LxUqujp+pfDngsHa5koYM7LG7eT9gi99ZH0Vni /ojgpwc/pM0ScBfqC01y0yL4MYNOjC6WF/OU4Nc1kV3jcjM3TwxblPf82c5WdeUiJ6zLyd HnACWJgyoJEpwDhcUHezi1pGMCsSH5k= Received: by mail-ed1-f74.google.com with SMTP id o21-20020aa7dd55000000b004a245f58006so3555462edw.12 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=zZ9DiHBZ9rAsvTvXkpzhjR+r/sIZHhWMhwQgYYFOqmrJSst4YCK3TGAyuDUJARm0ZG j5T+/QgU8IMYJizobVlTF+aqNQXRkeQV2D4j743jVgetg2Nt2YvaH2zpI7Fa5gGURvZt +dTcMnSwWRw6b6Zmq2kWnIiWObf4d2LplWk5QX00Vt+gIWtVWd+GwnTRiTZRiPFOgosM SlOljWJJU/QWfH4Sya0j5Ye4VvTeUXS4k7tXBwLxP+MTo0AoP3bB5lCwxWZQCijXcq99 F2cymrjQqHtUJeld6rMkT1RPcXNinZq2psNEdgsprUvKiOpR3oufdsBTRCwT3kYa7BB4 LUcw== X-Gm-Message-State: AO0yUKVPXSnBlpc7kHxo7ZU+5p2HF8XYh2KZZwxGh5CA0ilG6j1tvqOm vCZ5WUca5qrvqJiZPtOK/AeHw4oUJw== X-Google-Smtp-Source: AK7set/LwR60te1ZQ71uZxsc1KgkcxZbDo0ZLCv+udJZ5Z75cmOSDIH+Ct1XO9+Xmd+GDajMudFF6OPa5g== 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-Rspamd-Queue-Id: A7D4C18000C X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: ibitdg8qmdpy51oe9c4kfh1wecd4cjfe X-HE-Tag: 1676591138-249787 X-HE-Meta: U2FsdGVkX198yKBQs+LEoKiIJCa817XUxNtV9BM5VKVuQzggpPqaSDoZJaZP6YqOtiJvlLrbwkFiKqtaiKUR+gNLSBk+q1rPgz6m6CUZQoXaUc4+hPE1rWUgE8TJLe/ZLzvHB8/qlAwm9IIbW4w479R+ap4krz0nDlflW7tM29ynfkNFrzZjoIcQdzENgWvz3ShSBdOCwShTNM9AkZKMAzMfhWm+xpUySqZogSuP1QALJH2OB2ubiQkeh3tqrGyXpiFMjFD2Yvd4hTLs/9q1PjYsZuzjm/EVP5ucBaspxAn8QtIxfoppX+MRmYYVNmKQ8Qa+V4883G2yg4lmWOLgx4xdghg7g1b40ZyNW3D99y6uHJQkIPoX1nwjN6CpmN92WaaVBij+3Mdu750RthmjjDT9yujUOEAQIhAXpSMGZ0YCdrdcC5FnmQ4J/3VjVSofpFWH3RTm/KuT1FXDwpKGromuPOi+E4f4A7eI23g+QJCXq5Tl3471vs1CJFZUzzIaMymJrnFJQQvlN2PQySg+B/8fxAUEhSDhqtAtPKyKLuGRim99MHsHNUjwzl0Oi87BhFewwUiXCE5+MeX6//e2gC/FCLXut9yYUfarE44ZVqRF2EsnmfVm5Mv77RsL0VWDDPo2lUEI4SxqFvUYCWzntcyhySa5+LSQXck47e9wg+QdNF8WnWp0s4a/0W0+o3kRPI+EpzoaMgBoWn++M4zb7h4R3ApcxY/krvmXCP0RpxA7Ft6R8BOD5SIhkcY71Zq4VzMkWWDNpkDP6owp4LXhW8UpMoLQ7vbkXgLaOnD7N+KSW7ynZjMz9I4WqduL3IPKRXrlzJGWVKF6cDKZMSatZgEHjMdbsXbeGVKaG5iJfFMeCzOwbG0+O9CRmnLZdelU3C5kuD7TkjEgfS/axrSxN8uOJGc6fvqjy0XNp5Kuj6p9xLhqgR5eP5D7d946DJ+fi2qF+NlRGkEj0EvkVgo UWj75rWX B90nV4NEMAE+cDPdpzgnwuRV1GGc9kmlg9SUS95ioFccNg1BR+FGPQRWhb28lccmx+5rgB6sB6mwWrw+J1iqdDN1W4JEKyuo4iw7hSv6Vu1Vj7UD9rBn9HNP5v3hmSpk00D7nwSBZEg/3Brmg9mH4JyJfGChxNZlktXC+fktBpmD2X7nbeJY2cQg1JZKBcqJh8TzLZDXJ/6EyplCeTmpyypvPGi/NNg/2f1HDkUGz7uUYkMm1SO4wI6VmxPW8uTUm0mNqB6GjoppFuqUwX0da/XmPYA1T8PLhJ1AZFxDF0M7UOMsKCmSgY/ujZzJ1pxJUUEG0xfFZiiO71jrH3hsMHRumG2dJsUUTqAG0/3iphDFImRghPXywGRo7tZjYdKlfHK/l9D1Ms5G4wHAMP7gkhra/qbp8HN7Tq7h939VFEgMb1N8nCOUqsDmj2nIW3yV/udCczDImR9ValYOPwL0RgZkNCjSppMGFh4nKii90lLX32+j1SHyvnv9Afq//8hs4Tmz1TVp36qRa8QKTB/VAF7twMXUN/nJIWO9hG8f91mrKkrHeOqwXTzxPrdJY59dt35T/6ZJHlHp5+e9XjYVS89iGo4QX5pqDl4bI X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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)))