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=-15.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 2B452C433E2 for ; Tue, 15 Sep 2020 21:30:56 +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 B24E420731 for ; Tue, 15 Sep 2020 21:30:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="EIZveliM"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="gGShhG9R" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B24E420731 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=29xveH8is3jnFtGoECljjpd/v4ZymFNj/eMgPog2094=; b=EIZveliMyRd2iliLz+noUzL38 lvwiGErgW1krrvz083v8m9D8DqudjLUsHw7hZrM0JNcvDMhNoLE3ud3TIbQQfgFW0thwrdD8GSJmK WFpNmTZXV7ehfJ080uQCE72U6/CjHsrgjJgwgO8DuoQqTs2BpwS5X8MoTfaF0OaskrZ8RFMvZ+0FL j/JL48HF8YfyutZISX2050VL8deGHJMPjJcW7UuDwvuCb+nUvwwl4Rx29WWczJ+SH9Poc9YHgquWG L1WQJcllTSli0O/KkmH4HM4AqTh5yHlpTeqIuJNpYa3jzDqG5O8Wq2iMhpW0DU2VWAqmBPffsaYLj 2d4GPW7Ag==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIIVU-0004IN-0C; Tue, 15 Sep 2020 21:28:56 +0000 Received: from mail-wr1-x449.google.com ([2a00:1450:4864:20::449]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIIKb-0007Ia-T0 for linux-arm-kernel@lists.infradead.org; Tue, 15 Sep 2020 21:17:43 +0000 Received: by mail-wr1-x449.google.com with SMTP id f18so1699374wrv.19 for ; Tue, 15 Sep 2020 14:17:39 -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=gJaj9HJzY/xay7XUoLkj6R2OGJl/aiV7rlwVCZ5wZTg=; b=gGShhG9RfzxUJORAJUGoVV6FU0vEowbn6auu7yKf41CX89p6/5xtaqWfZfXtwdZseO ZZkWleubVSVVwvcV7jdnoJqptNYV+oLuntmAJqV8koLWbiNMEzMMeiBZLrXD4AyJdKlV QAdI2WRzVXOEXSqdulCZ22bdnCSfJlMn+TSKTjmlwBNAFLWjBb4QZ9nUDXs/geDhodZF lHdn/CMNBDNzl6HPU3g6w5p110DUQ4p6Q3/NxDbK5DQ5dFZSe3FkhOBElojem+jjPsqq Vf2OAk+IONfZnGJx+bpkcYWy8P79TampsVQtbxCtLDNbAJD1++c+8rwz1LKrIQwGojKw KgQw== 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=gJaj9HJzY/xay7XUoLkj6R2OGJl/aiV7rlwVCZ5wZTg=; b=KtPKct89IIudCpPiGHdppvK65fsZVMIkXdk8Fp4KJ9ynnwhXep4wYE4PJg7yEuWQ9i D1rbxKJSxnpCBoZejfxFq23C3qa59g2v2A/zgR7v1rVBzMry55F+g+GcmoC48gpNU2gN tLv//wZ4IGD2U0wVuJCgGIqV0CRfd0FdXCKq9BaA6TS+lf0ZGFiTF70hkkBFD6WTwhKz +rytSHYVH8d5u659Mu6LV0zfLt7P9py3iM9sEzNSP3oP9bYAZXN/X+XZqfsp5qv8UkPp LINS3fGTP/olfFsz09XFD5qMAAWT9yOF2pq3eeoY2DhxByLttQsyNQK+G3aOKFwi17Qb N3ZA== X-Gm-Message-State: AOAM533f4Dw3MLVgf6bFrgKka3+LmByyjfv1SnFKZOcUHN8VbsstnZzj DQ+55KcmhBLc3JTojWc1AUfMIN0UuUZcXp/U X-Google-Smtp-Source: ABdhPJz5Xohf4ARkglaPkRRJQxL2SqgjcqjnN5AC/Am00hGW5Wrd6XlIFiWLgi6EalEXv6txBloeoUIiPWUmpXXK X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a7b:c14f:: with SMTP id z15mr181253wmi.1.1600204657873; Tue, 15 Sep 2020 14:17:37 -0700 (PDT) Date: Tue, 15 Sep 2020 23:16:13 +0200 In-Reply-To: Message-Id: <0a35b29d161bf2559d6e16fbd903e49351c7f6b8.1600204505.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog Subject: [PATCH v2 31/37] 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-20200915_171742_049400_72DBAD7E X-CRM114-Status: GOOD ( 13.31 ) 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 --- 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.618.gf4bc123cb7-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel