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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, 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 614C5C433C1 for ; Tue, 30 Mar 2021 15:35:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DE0E6619A7 for ; Tue, 30 Mar 2021 15:35:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DE0E6619A7 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 5FD216B0082; Tue, 30 Mar 2021 11:35:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 585D66B0085; Tue, 30 Mar 2021 11:35:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3FF816B0087; Tue, 30 Mar 2021 11:35:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0201.hostedemail.com [216.40.44.201]) by kanga.kvack.org (Postfix) with ESMTP id 22C2E6B0082 for ; Tue, 30 Mar 2021 11:35:41 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id D8EA18249980 for ; Tue, 30 Mar 2021 15:35:40 +0000 (UTC) X-FDA: 77976940440.20.4456495 Received: from mail-qt1-f201.google.com (mail-qt1-f201.google.com [209.85.160.201]) by imf09.hostedemail.com (Postfix) with ESMTP id BCCFF60006D5 for ; Tue, 30 Mar 2021 15:35:30 +0000 (UTC) Received: by mail-qt1-f201.google.com with SMTP id w8so7700538qtk.3 for ; Tue, 30 Mar 2021 08:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=q7MsrOk2npJtSNdwNIXd9WmInrGYWhEX/by2Gk6QS24=; b=TMlZyMKLF6+u73+vvDs10ucDaUCG/DH7NE0rd/9/9/C0wXaIUSqOSu0YqNP3qDF3ua gs80vXCGa+Q3MBcCQzUrspjRaJ8ZsXbXAoX3Bk03Wyvta6OcI86hcUYy7l6lIbI1zNK5 IXuhVvS7QRTZeNiOzsWIBqamgVGdNEAj1pcVP+wDbk0UlAI6q5zb1htWm0kW/9Sr4lfN vrJY4Q3zbffDzrZ0ik4myEBrn4vsQkU9ZwAI5AufdkqKL38pSbci7UI3Xhr8eQPp073O vXqwOu1u/RQAVFPjX3ylAhJ2T4oaZvReSjlDw3Hj3N9QxPxm/ctYliZjDrZD/v6WXsdI zVzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=q7MsrOk2npJtSNdwNIXd9WmInrGYWhEX/by2Gk6QS24=; b=iBuvxnXXSUhXxOawaJHNVvKk58njIX/XIE1DU9r1W63MCxE5EpT6Pklm09ucnkPbYr MROLJQHWNL9mgj2dyWawI1J8eH60peE23aIhZGep0KHU6tGgDE9RIl24b7+TLYzNdX90 qrEt1uBsOO0ylgKQzQj/b13y5FhV9nueM/JVPfBLX6kXVfvxgd/NG8jtozlFCtKMHJkI Ll8IVCaIec23aqvpPwqH7ZbV8GmLstn3zIx3KU8l1J1WMvgwfIAumLaH8tguWLhpP05i wPg1AERh79/EAkqPt8HrHjAlzF3EMUckQgAMwFpGpy53uLG7f5XWstOfGRd9YRHSgj4s KxBQ== X-Gm-Message-State: AOAM5323ku7kkYvZAqnibVLLvEg9UvI6foX3gCltL7oL+ZmUhMXDUjD/ 1WG4j0s8uVixfXR7tnebBnzyTvyCKZ3NR0yu X-Google-Smtp-Source: ABdhPJxZie0Pgr6yuUoIaRSVo3tk5+dKFfBmuFnR4wJcoDADwMUFyZHcXz/XLlpiWT+/jEP2GAaownmByR8COW6h X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:f567:b52b:fb1e:b54e]) (user=andreyknvl job=sendgmr) by 2002:a0c:ed2c:: with SMTP id u12mr31246924qvq.30.1617118526298; Tue, 30 Mar 2021 08:35:26 -0700 (PDT) Date: Tue, 30 Mar 2021 17:35:23 +0200 Message-Id: <2dc799014d31ac13fd97bd906bad33e16376fc67.1617118501.git.andreyknvl@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.31.0.291.g576ba9dcdaf-goog Subject: [PATCH] kasan: fix conflict with page poisoning From: Andrey Konovalov To: Andrew Morton Cc: Alexander Potapenko , Marco Elver , Dmitry Vyukov , Andrey Ryabinin , Andrey Konovalov , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: BCCFF60006D5 X-Stat-Signature: p1r7syqjnxzgkdfw6i54nqzfp84sx71n Received-SPF: none (flex--andreyknvl.bounces.google.com>: No applicable sender policy available) receiver=imf09; identity=mailfrom; envelope-from="<3PkVjYAoKCF87KAOBVHKSIDLLDIB.9LJIFKRU-JJHS79H.LOD@flex--andreyknvl.bounces.google.com>"; helo=mail-qt1-f201.google.com; client-ip=209.85.160.201 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1617118530-649676 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: When page poisoning is enabled, it accesses memory that is marked as poisoned by KASAN, which leas to false-positive KASAN reports. Suppress the reports by adding KASAN annotations to unpoison_page() (poison_page() already has them). Signed-off-by: Andrey Konovalov --- mm/page_poison.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/page_poison.c b/mm/page_poison.c index 65cdf844c8ad..655dc5895604 100644 --- a/mm/page_poison.c +++ b/mm/page_poison.c @@ -77,12 +77,14 @@ static void unpoison_page(struct page *page) void *addr; addr = kmap_atomic(page); + kasan_disable_current(); /* * Page poisoning when enabled poisons each and every page * that is freed to buddy. Thus no extra check is done to * see if a page was poisoned. */ - check_poison_mem(addr, PAGE_SIZE); + check_poison_mem(kasan_reset_tag(addr), PAGE_SIZE); + kasan_enable_current(); kunmap_atomic(addr); } -- 2.31.0.291.g576ba9dcdaf-goog