From patchwork Fri Apr 9 20:27:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 12195035 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.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 2E7AFC433ED for ; Fri, 9 Apr 2021 20:27:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D5AF9610A8 for ; Fri, 9 Apr 2021 20:27:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D5AF9610A8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 759F66B006C; Fri, 9 Apr 2021 16:27:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 731676B0082; Fri, 9 Apr 2021 16:27:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5D29F6B0083; Fri, 9 Apr 2021 16:27:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0205.hostedemail.com [216.40.44.205]) by kanga.kvack.org (Postfix) with ESMTP id 4279A6B006C for ; Fri, 9 Apr 2021 16:27:40 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 0075D184A82D4 for ; Fri, 9 Apr 2021 20:27:39 +0000 (UTC) X-FDA: 78013964280.14.C3BAD23 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf13.hostedemail.com (Postfix) with ESMTP id 39348E000105 for ; Fri, 9 Apr 2021 20:27:37 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id A566F61007; Fri, 9 Apr 2021 20:27:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1618000059; bh=x3HiqR1R25ZlyvBo+3cmSPknexJ1lOMTL7lM9RfdN00=; h=Date:From:To:Subject:In-Reply-To:From; b=BpV2XIIsvuzKurtSXZPBUR1Rj7aYekSo25WY41/Qxk7AfIeGfHkJFuoLPehCPKHhZ VsQ6qtms0J2Nl3OXkwullBSkZxhsE56I4IApVJ1SOnVuU8vKqL1lS4Wk9hk7v5tmcR VZ7cK5dzoZZbAbZfL66cyaLX7Aj2Nxwui1XMWkk8= Date: Fri, 09 Apr 2021 13:27:38 -0700 From: Andrew Morton To: akpm@linux-foundation.org, andreyknvl@gmail.com, andreyknvl@google.com, aryabinin@virtuozzo.com, dvyukov@google.com, elver@google.com, glider@google.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 13/16] kasan: fix conflict with page poisoning Message-ID: <20210409202738.zz1hd8EMu%akpm@linux-foundation.org> In-Reply-To: <20210409132633.6855fc8fea1b3905ea1bb4be@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Rspamd-Queue-Id: 39348E000105 X-Stat-Signature: m9kc6jjqbgahm3sa4pfkx6sxsjmuzroi X-Rspamd-Server: rspam02 Received-SPF: none (linux-foundation.org>: No applicable sender policy available) receiver=imf13; identity=mailfrom; envelope-from=""; helo=mail.kernel.org; client-ip=198.145.29.99 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618000057-115112 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: From: Andrey Konovalov Subject: kasan: fix conflict with page poisoning 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). Link: https://lkml.kernel.org/r/2dc799014d31ac13fd97bd906bad33e16376fc67.1617118501.git.andreyknvl@google.com Signed-off-by: Andrey Konovalov Cc: Alexander Potapenko Cc: Marco Elver Cc: Dmitry Vyukov Cc: Andrey Ryabinin Cc: Andrey Konovalov Signed-off-by: Andrew Morton --- mm/page_poison.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/mm/page_poison.c~kasan-fix-conflict-with-page-poisoning +++ a/mm/page_poison.c @@ -77,12 +77,14 @@ static void unpoison_page(struct page *p 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); }