linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Miaohe Lin <linmiaohe@huawei.com>
To: <akpm@linux-foundation.org>, <vitaly.wool@konsulko.com>
Cc: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
	<linmiaohe@huawei.com>
Subject: [PATCH 9/9] mm/z3fold: fix z3fold_page_migrate races with z3fold_map
Date: Fri, 29 Apr 2022 14:40:51 +0800	[thread overview]
Message-ID: <20220429064051.61552-10-linmiaohe@huawei.com> (raw)
In-Reply-To: <20220429064051.61552-1-linmiaohe@huawei.com>

Think about the below scene:
CPU1				CPU2
 z3fold_page_migrate		z3fold_map
  z3fold_page_trylock
  ...
  z3fold_page_unlock
  /* slots still points to old zhdr*/
				 get_z3fold_header
				  get slots from handle
				  get old zhdr from slots
				  z3fold_page_trylock
				  return *old* zhdr
  encode_handle(new_zhdr, FIRST|LAST|MIDDLE)
  put_page(page) /* zhdr is freed! */
				 but zhdr is still used by caller!

z3fold_map can map freed z3fold page and lead to use-after-free bug.
To fix it, we add PAGE_MIGRATED to indicate z3fold page is migrated
and soon to be released. So get_z3fold_header won't return such page.

Fixes: 1f862989b04a ("mm/z3fold.c: support page migration")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
 mm/z3fold.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/mm/z3fold.c b/mm/z3fold.c
index a7769befd74e..f41f8b0d9e9a 100644
--- a/mm/z3fold.c
+++ b/mm/z3fold.c
@@ -181,6 +181,7 @@ enum z3fold_page_flags {
 	NEEDS_COMPACTING,
 	PAGE_STALE,
 	PAGE_CLAIMED, /* by either reclaim or free */
+	PAGE_MIGRATED, /* page is migrated and soon to be released */
 };
 
 /*
@@ -270,8 +271,13 @@ static inline struct z3fold_header *get_z3fold_header(unsigned long handle)
 			zhdr = (struct z3fold_header *)(addr & PAGE_MASK);
 			locked = z3fold_page_trylock(zhdr);
 			read_unlock(&slots->lock);
-			if (locked)
-				break;
+			if (locked) {
+				struct page *page = virt_to_page(zhdr);
+
+				if (!test_bit(PAGE_MIGRATED, &page->private))
+					break;
+				z3fold_page_unlock(zhdr);
+			}
 			cpu_relax();
 		} while (true);
 	} else {
@@ -389,6 +395,7 @@ static struct z3fold_header *init_z3fold_page(struct page *page, bool headless,
 	clear_bit(NEEDS_COMPACTING, &page->private);
 	clear_bit(PAGE_STALE, &page->private);
 	clear_bit(PAGE_CLAIMED, &page->private);
+	clear_bit(PAGE_MIGRATED, &page->private);
 	if (headless)
 		return zhdr;
 
@@ -1576,7 +1583,7 @@ static int z3fold_page_migrate(struct address_space *mapping, struct page *newpa
 	new_zhdr = page_address(newpage);
 	memcpy(new_zhdr, zhdr, PAGE_SIZE);
 	newpage->private = page->private;
-	page->private = 0;
+	set_bit(PAGE_MIGRATED, &page->private);
 	z3fold_page_unlock(zhdr);
 	spin_lock_init(&new_zhdr->page_lock);
 	INIT_WORK(&new_zhdr->work, compact_page_work);
@@ -1606,7 +1613,8 @@ static int z3fold_page_migrate(struct address_space *mapping, struct page *newpa
 
 	queue_work_on(new_zhdr->cpu, pool->compact_wq, &new_zhdr->work);
 
-	clear_bit(PAGE_CLAIMED, &page->private);
+	/* PAGE_CLAIMED and PAGE_MIGRATED are cleared now. */
+	page->private = 0;
 	put_page(page);
 	return 0;
 }
-- 
2.23.0


  parent reply	other threads:[~2022-04-29  6:41 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-29  6:40 [PATCH 0/9] A few fixup patches for z3fold Miaohe Lin
2022-04-29  6:40 ` [PATCH 1/9] mm/z3fold: fix sheduling while atomic Miaohe Lin
2022-05-19  7:00   ` Vitaly Wool
2022-04-29  6:40 ` [PATCH 2/9] mm/z3fold: fix possible null pointer dereferencing Miaohe Lin
2022-05-19  7:04   ` Vitaly Wool
2022-04-29  6:40 ` [PATCH 3/9] mm/z3fold: remove buggy use of stale list for allocation Miaohe Lin
2022-05-19  7:06   ` Vitaly Wool
2022-04-29  6:40 ` [PATCH 4/9] mm/z3fold: throw warning on failure of trylock_page in z3fold_alloc Miaohe Lin
2022-05-19  7:10   ` Vitaly Wool
2022-05-19 11:10     ` Miaohe Lin
2022-04-29  6:40 ` [PATCH 5/9] revert "mm/z3fold.c: allow __GFP_HIGHMEM in z3fold_alloc" Miaohe Lin
2022-05-19  7:12   ` Vitaly Wool
2022-05-19 11:34     ` Miaohe Lin
2022-05-19 18:31       ` Andrew Morton
2022-05-20  2:30         ` Miaohe Lin
2022-04-29  6:40 ` [PATCH 6/9] mm/z3fold: put z3fold page back into unbuddied list when reclaim or migration fails Miaohe Lin
2022-05-19  7:13   ` Vitaly Wool
2022-04-29  6:40 ` [PATCH 7/9] mm/z3fold: always clear PAGE_CLAIMED under z3fold page lock Miaohe Lin
2022-05-19  7:14   ` Vitaly Wool
2022-04-29  6:40 ` [PATCH 8/9] mm/z3fold: fix z3fold_reclaim_page races with z3fold_free Miaohe Lin
2022-05-19  7:24   ` Vitaly Wool
2022-04-29  6:40 ` Miaohe Lin [this message]
2022-05-19  7:28   ` [PATCH 9/9] mm/z3fold: fix z3fold_page_migrate races with z3fold_map Vitaly Wool
2022-05-17 23:45 ` [PATCH 0/9] A few fixup patches for z3fold Andrew Morton
2022-05-18  2:01   ` Miaohe Lin
2022-05-18 10:39     ` Vitaly Wool
2022-05-19  1:54       ` Miaohe Lin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220429064051.61552-10-linmiaohe@huawei.com \
    --to=linmiaohe@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=vitaly.wool@konsulko.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).