From patchwork Tue Nov 10 22:10:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11895547 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 F053915E6 for ; Tue, 10 Nov 2020 22:12:00 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AF0B520781 for ; Tue, 10 Nov 2020 22:12:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="CLSgr8f8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AF0B520781 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E0C066B00A5; Tue, 10 Nov 2020 17:11:58 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D45216B00A6; Tue, 10 Nov 2020 17:11:58 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B96C86B00A7; Tue, 10 Nov 2020 17:11:58 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0244.hostedemail.com [216.40.44.244]) by kanga.kvack.org (Postfix) with ESMTP id 883CE6B00A5 for ; Tue, 10 Nov 2020 17:11:58 -0500 (EST) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 386AB362E for ; Tue, 10 Nov 2020 22:11:58 +0000 (UTC) X-FDA: 77469907116.07.cork44_110cfdb272f8 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id 1EFF41803F9A4 for ; Tue, 10 Nov 2020 22:11:58 +0000 (UTC) X-Spam-Summary: 1,0,0,0604e1d9a8d2bbea,d41d8cd98f00b204,3lbcrxwokcpsdqguh1nqyojrrjoh.frpolqx0-ppnydfn.ruj@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:973:988:989:1042:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:1981:2194:2199:2393:2559:2562:3138:3139:3140:3141:3142:3152:3352:3865:3866:3867:3868:3871:3874:4250:4321:5007:6261:6653:6742:8603:9969:10004:10400:10450:10455:11026:11232:11473:11658:11914:12043:12114:12297:12438:12555:12895:12986:13069:13311:13357:14181:14394:14659:14721:19904:19999:21080:21365:21444:21451:21627:21772:21990:30054,0,RBL:209.85.219.73:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yg7gnr69xesjkkcdpf17da51pixyphwmt9351zp8pfnobtxxbtbkh47z6pb85.mjm5xs36zhgxshc1pjq7e63kw7ub3u5wjxk3oa7a11j6brgwfcq8q83zr3b589c.q-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:n eutral,C X-HE-Tag: cork44_110cfdb272f8 X-Filterd-Recvd-Size: 4540 Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) by imf09.hostedemail.com (Postfix) with ESMTP for ; Tue, 10 Nov 2020 22:11:57 +0000 (UTC) Received: by mail-qv1-f73.google.com with SMTP id u3so40983qvb.19 for ; Tue, 10 Nov 2020 14:11: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=5uhZzkc7GaVITot0FsuHIhcvnz4Kwzzg7fDog44yjpY=; b=CLSgr8f8FTIZg6bMIyxaGVeeEcFOrWMDPbZPAvZT1MfB4z8Suhe5boRMsumGyvFNk1 LjKKm50iHbXfmNRu6XUs4UoHXQGDFig39TSyU2sHd0hIZ2EmrYhkxzXr8U4p+VkIwgdM 2IMyJ+g9REJj6rC5asdtdPRqDTIWpdnLuyBD3ISr476SrLsl4NF2QxsJYt1ycv9Li3MH c9uWYFVeV0cpoffBVtKxcgpoC5/H2MqBNHloRHtFwiFpBpQmj6raqt5/JRE4I92gqqWy iMqrQ8YQcXmy5elG+vxv2r33iGPpMhXlwcHnNfP58dfpYMKVCKC1qKG9aVX4wbq0hppg wL1Q== 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=5uhZzkc7GaVITot0FsuHIhcvnz4Kwzzg7fDog44yjpY=; b=EJz/EY8P+FY6jcBZtEi4mHCl83gaW0k0J7SIvLrNvj+rMU6BgSyEckG1u86Jm1/FW5 9ZAsEUZQRNxBSwOiWEklrjMdWh2WxcZNUDJbXOU5LLJldWY/uruNa4pBhmErrjhvYZLd KsLtcXYbSmCKUvdHtAZwEBRVjMZnQRpVF4m+OuCgEtJadJtzVNNbSnf1QN65OQTlnJvG ceEbPDd2dBueYkq51r6cLGaUZ6XcrmR8Yt+isaTAScoYCq2DfblxS4GWScNJYTF9WvNb fWqfZUpAa79HS1jrxxHDIf9sHs3WbW83J83cqZIlRmmqWOusslqKR9N51QYrRO4N04Hy uY9g== X-Gm-Message-State: AOAM532vrTSj3uMTy60xVF4xoHzRBFfD2UFyswaL5UqEP0PiH1sW0lhI WJ/IocC87UfyL5AdUxUZlLdgJmdJQP+rGcth X-Google-Smtp-Source: ABdhPJxlGUcHEC0cFkjY++xEGK8kde6sgJxy5/dNx6kc2EDZ6TfPWJDPwJEgMWeFJJ/BNXjkc/AzCq+AKE2M2FFw X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:47b0:: with SMTP id a16mr21217064qvz.22.1605046316972; Tue, 10 Nov 2020 14:11:56 -0800 (PST) Date: Tue, 10 Nov 2020 23:10:18 +0100 In-Reply-To: Message-Id: <49f7f2c12b0d5805f9a7b7092b986bbc2dd077a1.1605046192.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.222.g5d2a92d10f8-goog Subject: [PATCH v9 21/44] 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 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000453, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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