From patchwork Thu Sep 24 22:50:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11798441 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 965F3112E for ; Thu, 24 Sep 2020 23:05:18 +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 65EA12396F for ; Thu, 24 Sep 2020 23:05:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="H3tqTF63"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="Ma0reHmg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 65EA12396F 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+patchwork-linux-arm=patchwork.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=oEsdw6732Akml2Rb1rBfm3AEeH+46Oi81bzrdp8HHOA=; b=H3tqTF63KRZeHxQLkx/z+5pmi BsLYkn0idkadX0dNLahpODF6w24n3OT8Y0fJP/ThM3ilEYx68hLsgbG4djG/tV3nRbzb9LgL0+uMZ 2GwXfy7SO8qWHH0WStzpbFCXAJpxAzYzwmEVMi1zcJKce4iF2YC2KXvA6EkFnTmpC9BEI/Y2W7Xa2 JvyJGRKYfGqIkrIkG+KN0mrt/nhOgtZBdcuhdqGDiw87VdTyyt+2Cyrht7/84xoynanzWdHxIlNlU h+SSWjmgdxa1KngPb5GYfbUtzNvHEORwaJcIZVRNG3aKTBrO2z4CTwlRwQCG4utANzeQVnhGLUKrh ChFho6NdQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLaIH-00086q-GD; Thu, 24 Sep 2020 23:04:53 +0000 Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLa63-0002ah-Fq for linux-arm-kernel@lists.infradead.org; Thu, 24 Sep 2020 22:52:16 +0000 Received: by mail-wr1-x44a.google.com with SMTP id g6so295787wrv.3 for ; Thu, 24 Sep 2020 15:52:13 -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=9ix+4hPu1M5tbLN/A8rv1MdksQ02QT73msi6Zomooco=; b=Ma0reHmgRrXe7ZEFQXfx1d47BhbGRVFFVtLMNpKIYkroh/WsoH0zzb9vEX7PJNsBZX MvoRg8PhC3h+BOqW+llmls/8hbRbbZ1Tq7hRXZwSSjNkxw0JMGaplX2KLB1oDuhJRLvI hCMJ1cNXRLgZTTH4f/Trf8hn0aYiQWGjy7Ya8VA8LgFuPL2232Etv3fiNtJ5s114AV+p Ogyk3XIRMBf7tcixqmZXZ4TN7VY9s6zZtwQinnL4KXQyYsb8IP8S730U/VRR6YDrZhgF PE+yY6ngqt4YmRKwMU5cWxrMqXdOYgaIOZiNWmHs7U1+wOVAe6JvnGCRMsO7oiwqmgqi MHDw== 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=9ix+4hPu1M5tbLN/A8rv1MdksQ02QT73msi6Zomooco=; b=UobvvBQiboWMVS//Ky1iphWlDIGxMGpDurNmMl1SiV/rYNzdcuYo8n7mku84p/TnUP LdivSEhllJCIqhOe0BZL9YQaVpCYvW6RQjGJU/Qb7cSFqhIwmb216ZXyKbcdco98UQct Zk5pH77ZOm49ralT6Gt8tT0HHGo/Un/AB3mE3ewUfYhHGuCA7zvCgR9gQKNeo9nuRRdF 1C+45jIbxJxLBW4lhBr7EMUkOvPM2lhD5CYBItm9SYGVA+orxa/I8eXE3syMAYhhLCRO yPM8oIHkfSGBISrWu02+63LoLojYSlF+TbBgdXlYVO/JL9xzhQYJUpWLhgBfXmbGeeZl yabg== X-Gm-Message-State: AOAM532xUiLlOWPjIYeDvlLrPlJyWCtTzyFrlTCtY9kbaD+P8H6PwNtF FjnYJJ+somzmQBJzcOT5qhgcWE80ncBbrbMk X-Google-Smtp-Source: ABdhPJxD5l1Q0TmL1dhuQR7JNlClvYF7rOwx/IOsuADQHKRA4bUqy/l1UAdUOuvc5I4Hi3CYk0rlluYvwfinvhIe X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:f619:: with SMTP id w25mr852343wmc.62.1600987932419; Thu, 24 Sep 2020 15:52:12 -0700 (PDT) Date: Fri, 25 Sep 2020 00:50:40 +0200 In-Reply-To: Message-Id: <78ebf3bed0458172fec9e1e32f2d29d7c8c37341.1600987622.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog Subject: [PATCH v3 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-20200924_185215_630386_52D40764 X-CRM114-Status: GOOD ( 12.89 ) X-Spam-Score: -7.7 (-------) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-7.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:44a listed in] [list.dnswl.org] -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 DKIMWL_WL_MED DKIMwl.org - Medium trust sender 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 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.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