Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95723C19F2A for ; Mon, 8 Aug 2022 01:36:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 140698E0002; Sun, 7 Aug 2022 21:36:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0EF8B8E0001; Sun, 7 Aug 2022 21:36:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EF9428E0002; Sun, 7 Aug 2022 21:36:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id DE6C98E0001 for ; Sun, 7 Aug 2022 21:36:26 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id BDB1EC085D for ; Mon, 8 Aug 2022 01:36:26 +0000 (UTC) X-FDA: 79774710372.09.743D431 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf03.hostedemail.com (Postfix) with ESMTP id 5276520152 for ; Mon, 8 Aug 2022 01:36:26 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1B4FAB80E0D; Mon, 8 Aug 2022 01:36:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3DF8C433D6; Mon, 8 Aug 2022 01:36:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922583; bh=FmQIlNTwGlNdvZn1TG5RW8+hIjWx0EO5FmZkcAirrUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EwwEAo/ks2Jkouaye0VLdkhIn2y54zQO6j0c1uffSnvIMHMhK9fmSvTA5Wx5PcYbY qivRnWaq3l2kO+6BJGhEEylgzsCmQMrmdfbF1/wZRpDIlAyP7Em4zmNDNiHnHiJEgH PlmsBqONFMuLDdLbwFdh2nU3Zj5uOOPaRu2MNMuoYSlG47v5yWoVzs6eJCW3hVD/ih VgpMWuPK9ytSV+wwgBTw9DC2Q2F7NvzqCswQ7SVd7zGtF7vu6Ms4wMaqEiCdpm3kui EOHW32Uz72Z3tmH0A7zHuoQBAyqKzRLlU0/6u1yxpt0RjG4NXuk5GzevlS5l2Uxg5f WuECARYRS8NnQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Catalin Marinas , Andrey Konovalov , Andrey Ryabinin , Vincenzo Frascino , Will Deacon , Sasha Levin , kasan-dev@googlegroups.com, linux-mm@kvack.org Subject: [PATCH AUTOSEL 5.15 08/45] mm: kasan: Ensure the tags are visible before the tag in page->flags Date: Sun, 7 Aug 2022 21:35:12 -0400 Message-Id: <20220808013551.315446-8-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013551.315446-1-sashal@kernel.org> References: <20220808013551.315446-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="EwwEAo/k"; spf=pass (imf03.hostedemail.com: domain of sashal@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659922586; a=rsa-sha256; cv=none; b=w02/x8IULI6ZzsPCWUSXhSwp9VA7QDHaWtCsZg2tm0PRWr+u9dhWDYhPp+smj9l/6AKksj 7pi1uwo7XpoSm9P1YQXkTvnA22YeqjDbxMs3latpvhdXGnNnNx+kiLVfS2Qjh90dZzA+Vc FLxvRxoPXc03NXVD9hLVEEdKEFzTzvs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659922586; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=hqZxr8yTtuU6L/lt5Z9IZ+Zd47Tj9vQpybJBTa9AqCY=; b=PHkdFBbiz76m+LBPKk4jgCpQScNAZbHzpu1aHiAuwNgxrSzGDUjaJ7gJOxVlklm6QBKILz iWS/SpMFCSFK9P4iqusA+E6ysqyCozfXCBy8WCkEz/y7/M2swafUGGP/yao+kqK2Dxfbxf Z0MBqZdH+6HEObs/hsE6AZHCBpLKtig= X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 5276520152 X-Rspam-User: Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="EwwEAo/k"; spf=pass (imf03.hostedemail.com: domain of sashal@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-Stat-Signature: 947iqi5nyrcjz8ipjf7cjbjnnz8rw48z X-HE-Tag: 1659922586-408085 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: Catalin Marinas [ Upstream commit ed0a6d1d973e9763989b44913ae1bd2a5d5d5777 ] __kasan_unpoison_pages() colours the memory with a random tag and stores it in page->flags in order to re-create the tagged pointer via page_to_virt() later. When the tag from the page->flags is read, ensure that the in-memory tags are already visible by re-ordering the page_kasan_tag_set() after kasan_unpoison(). The former already has barriers in place through try_cmpxchg(). On the reader side, the order is ensured by the address dependency between page->flags and the memory access. Signed-off-by: Catalin Marinas Reviewed-by: Andrey Konovalov Cc: Andrey Ryabinin Cc: Vincenzo Frascino Reviewed-by: Vincenzo Frascino Link: https://lore.kernel.org/r/20220610152141.2148929-2-catalin.marinas@arm.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- mm/kasan/common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 2baf121fb8c5..0c36d3df23f3 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -109,9 +109,10 @@ void __kasan_unpoison_pages(struct page *page, unsigned int order, bool init) return; tag = kasan_random_tag(); + kasan_unpoison(set_tag(page_address(page), tag), + PAGE_SIZE << order, init); for (i = 0; i < (1 << order); i++) page_kasan_tag_set(page + i, tag); - kasan_unpoison(page_address(page), PAGE_SIZE << order, init); } void __kasan_poison_pages(struct page *page, unsigned int order, bool init) -- 2.35.1