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 X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E280EC4727E for ; Thu, 1 Oct 2020 23:23:02 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2F26920706 for ; Thu, 1 Oct 2020 23:23:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="oUbAvfvx"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="KNwdqefk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2F26920706 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kzA+QRKZTn9hZfenWGEnf5+RWIMa4sT5qLXciHIwO2U=; b=oUbAvfvxJdI8KB46QEsqnIh4n yh6RWTw6FhaRLLp3JAkcGQxR/lV4CEk8NUC+Tsvuys1y32HTB10Uxvi4W2wFipAM+IObE5xI83B9B ObZMn4puWQhRnnycQCY/b3p8xeLZFps8IGFxEUvt2N8YBVCaBZlWkuDBBH3WGhaMxkkpQG4zFp6B+ EJtQ5IJcUzgS9qL1+yaPQx2L5TN4YafeLntqHnS1vqRfpP//jBCFDfx9lIlNnVMKCOaB/FQQBUrvJ 673nrT9n1dAKLujTU9HpNyyAv1Egqdfb/3KTivlUjNTp+2DT03MSqdGB4t5oahORo1NB7quyS0B// LhDm6Vudg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kO7sF-0006A7-Ca; Thu, 01 Oct 2020 23:20:31 +0000 Received: from mail-qv1-xf49.google.com ([2607:f8b0:4864:20::f49]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kO7k9-0001TN-1e for linux-arm-kernel@lists.infradead.org; Thu, 01 Oct 2020 23:12:14 +0000 Received: by mail-qv1-xf49.google.com with SMTP id w32so244024qvw.8 for ; Thu, 01 Oct 2020 16:12:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=avhnvpcdCzsaNfGYEey/eQHTKDiaKIA9undXAy55Bw8=; b=KNwdqefk36p2HEpaZfVF5DhKCghwtU0IgELgXy9QnRwa8c+Lnl12IZ6fpscnRyFniv HUGR1zCI6BQ9Q9FRZBzbVWUohRmJbl+7Gpu6TA8NHaqNpUgiiJnEWNMPM74O084V8cXF +au8LuqVHVRxZHwtT6sVCZALTzAClLeqOUNhVjTzXXoHrdYbptMb6fJK6eUTjgvKb9pI Jxg4iir5BfEYC8enud0IzEDMHJ5HNH4nSISa+0do3PtkFOQ+FLMoRAQsezFdK52NtgBD vs3qqdkRaaeVlixCpdnU4AVPV1MMZCVuNmQlX6CAaJnFjA2lyalX/K3uUKwf2/hXJrxE W1yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=avhnvpcdCzsaNfGYEey/eQHTKDiaKIA9undXAy55Bw8=; b=Yek5HaLSzxKs1MC9qhe7ilQ9a/+GzQoDhxcT/SsBsJT7o6nrBUl+zVnxaLe6V2OD/7 duUGzh+eFid4h8AKQhptUlHfb9r2xsaR1wlOrheGLT6tqgmIsP6UVsJHJbCAgLRQ6ve4 H86hoeUaXCd8xTYpWSacsCR+ROggR4LgNzRJ/NITi0sSHmFXDyMAk7g+++jfbLRJ3QUD Yh3hqYH3F82FikEXlgZUOhPGi1G6g4mlEwUCoF8/XmY/fUSnXjXZeAeEGQydxhah/Vn0 KJG/xyY/5zwj0/MIiEDT+CQGK/HKG4JQvnzty41cOwJMZ9cLVU4Y5BNHEUrLKkcDVtyl PPuA== X-Gm-Message-State: AOAM531pkGiFolkU6ESbN+y/wuS2W0CkLKK6hQcoD+EzTs2YfJl1kovO 4V8AWCU4n3lrYRsT1KpLFctxMytbJeIxC311 X-Google-Smtp-Source: ABdhPJyCth9eK0vr0tDXn0cfgf0UsvDJmV1T+GmfvGSUaT4Yj1JF25ThMIrEu6N+Ro1lRthByohDgq2+g6EnxSdi X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:a899:: with SMTP id x25mr9459301qva.46.1601593923500; Thu, 01 Oct 2020 16:12:03 -0700 (PDT) Date: Fri, 2 Oct 2020 01:10:34 +0200 In-Reply-To: Message-Id: <21a9da4e730050d421eed7fcefda2db508c730a4.1601593784.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.709.gb0816b6eb0-goog Subject: [PATCH v4 33/39] kasan, x86, s390: update undef CONFIG_KASAN From: Andrey Konovalov To: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201001_191209_201289_7DCC96D2 X-CRM114-Status: GOOD ( 12.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marco Elver , Elena Petrova , Andrey Konovalov , Kevin Brodsky , Will Deacon , Branislav Rankov , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , linux-arm-kernel@lists.infradead.org, Andrey Ryabinin , Andrew Morton , Evgenii Stepanov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org With the intoduction of hardware tag-based KASAN some kernel checks of this kind: ifdef CONFIG_KASAN will be updated to: if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) x86 and s390 use a trick to #undef CONFIG_KASAN for some of the code that isn't linked with KASAN runtime and shouldn't have any KASAN annotations. Also #undef CONFIG_KASAN_GENERIC with CONFIG_KASAN. Signed-off-by: Andrey Konovalov Signed-off-by: Vincenzo Frascino Reviewed-by: Marco Elver --- Change-Id: I2a622db0cb86a8feb60c30d8cb09190075be2a90 --- arch/s390/boot/string.c | 1 + arch/x86/boot/compressed/misc.h | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/s390/boot/string.c b/arch/s390/boot/string.c index b11e8108773a..faccb33b462c 100644 --- a/arch/s390/boot/string.c +++ b/arch/s390/boot/string.c @@ -3,6 +3,7 @@ #include #include #undef CONFIG_KASAN +#undef CONFIG_KASAN_GENERIC #include "../lib/string.c" int strncmp(const char *cs, const char *ct, size_t count) diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index 726e264410ff..2ac973983a8e 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -12,6 +12,7 @@ #undef CONFIG_PARAVIRT_XXL #undef CONFIG_PARAVIRT_SPINLOCKS #undef CONFIG_KASAN +#undef CONFIG_KASAN_GENERIC /* cpu_feature_enabled() cannot be used this early */ #define USE_EARLY_PGTABLE_L5 -- 2.28.0.709.gb0816b6eb0-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel