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=-20.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 496ABC388F7 for ; Wed, 4 Nov 2020 23:20:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EDE6020786 for ; Wed, 4 Nov 2020 23:20:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="br613dpy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732756AbgKDXUC (ORCPT ); Wed, 4 Nov 2020 18:20:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732745AbgKDXT6 (ORCPT ); Wed, 4 Nov 2020 18:19:58 -0500 Received: from mail-qv1-xf4a.google.com (mail-qv1-xf4a.google.com [IPv6:2607:f8b0:4864:20::f4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3EF0C0613D3 for ; Wed, 4 Nov 2020 15:19:57 -0800 (PST) Received: by mail-qv1-xf4a.google.com with SMTP id d18so6549838qvp.15 for ; Wed, 04 Nov 2020 15:19:57 -0800 (PST) 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=oA6gmttblv8OmG3VJbCFTsqSwJTzGphkOsRK2ZeD750=; b=br613dpyefM6H17vxZ5Q4p0T39IrkLkDnZLDTiqqPDpFMMgCo+4VFo3LKvZ1P6Dslp Mf0CE4Fw8PeS1fwsbMEmuShN8+EPmelyh7nDN5LzLby357nasoxjb1LANRxkuexwVPYe LwxGSUVFyLKhDH7ttzPPyxGueeWEhdpcVUDqW8ywGJLzVo4fA0K/aUx0n7km3P0JtRv3 Bp90RJW5FmSu2QzXaJFlBCHC5YOHK7dIZG60fFIdPzS0+fZH/bTCh+FrxoeQO07FhrqG RDBlgXLvB97eS/lAALxVKBMD+H2a58tt8HMP59QEf4qm99yP2PbJYpKXnSdMApGfMszG ugBQ== 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=oA6gmttblv8OmG3VJbCFTsqSwJTzGphkOsRK2ZeD750=; b=SppzRfqLwecVHaMMjXAmK1zRvFDUD13Jz3yItRhopeyQ2m3plEtagW6TsAaqmOUFyP gF/ZQ40ovwupe2XN4XtIRGaBSg3nip8U91AliaI+sWCu3iEv3G2mVUcPKRp6ESNwnO5S eZ1EYN5R22MmyypfOqSaWfo/vNbCSgPH6n9tAPWYU6G8SMKY+UBQ3ZGbGg01wVqLRdzv cOtMRoglESiSgR/oX17RJzyDEinn8sANh7PBDEppvCHqlHBNkrzqApsplCL5tNa6tEwn BF+9n+L9Eodx86Guc9F/FLW58EKlle+zUe+m6F8Fttxm7Vb1/0rlwzOrBVif/uAzjbDv TfSg== X-Gm-Message-State: AOAM531iArtndAlzgO6yMV+gH/Pn8fRAjXRYofQRl5hZfCs+huzG9sfS qry39aK2HAiJoKdW39hYTihx3BEbtYMGIDJu X-Google-Smtp-Source: ABdhPJw3SygWDpOISuAZQmg79+TdwGrWwFo7fxBzvvQW4z2e0Vzd9qlw00Tr0XM9KlVC8zJMzixPFDkx2UiyGedC Sender: "andreyknvl via sendgmr" X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:414d:: with SMTP id z13mr147192qvp.37.1604531997034; Wed, 04 Nov 2020 15:19:57 -0800 (PST) Date: Thu, 5 Nov 2020 00:18:36 +0100 In-Reply-To: Message-Id: <45dce4028d9f5e4c5705b481a8ac37bf516caa16.1604531793.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog Subject: [PATCH v8 21/43] kasan: kasan_non_canonical_hook only for software modes From: Andrey Konovalov To: Catalin Marinas Cc: Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a preparatory commit for the upcoming addition of a new hardware tag-based (MTE-based) KASAN mode. kasan_non_canonical_hook() is only applicable to KASAN modes that use shadow memory, and won't be needed for hardware tag-based KASAN. No functional changes for software modes. Signed-off-by: Andrey Konovalov Signed-off-by: Vincenzo Frascino Reviewed-by: Marco Elver --- Change-Id: Icc9f5ef100a2e86f3a4214a0c3131a68266181b2 --- mm/kasan/report.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 5d5733831ad7..594bad2a3a5e 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -403,7 +403,8 @@ bool kasan_report(unsigned long addr, size_t size, bool is_write, return ret; } -#ifdef CONFIG_KASAN_INLINE +#if (defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)) && \ + defined(CONFIG_KASAN_INLINE) /* * With CONFIG_KASAN_INLINE, accesses to bogus pointers (outside the high * canonical half of the address space) cause out-of-bounds shadow memory reads -- 2.29.1.341.ge80a0c044ae-goog