From: Xianting Tian <xianting.tian@linux.alibaba.com>
To: akpm@linux-foundation.org, ziy@nvidia.com,
gregkh@linuxfoundation.org, stable@vger.kernel.org,
guoren@kernel.org
Cc: huanyi.xj@alibaba-inc.com, guohanjun@huawei.com,
zjb194813@alibaba-inc.com, tianhu.hh@alibaba-inc.com,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Xianting Tian <xianting.tian@linux.alibaba.com>
Subject: [PATCH] mm: page_alloc: validate buddy page before using
Date: Fri, 17 Jun 2022 00:17:40 +0800 [thread overview]
Message-ID: <20220616161746.3565225-1-xianting.tian@linux.alibaba.com> (raw)
Commit 787af64d05cd ("mm: page_alloc: validate buddy before check its migratetype.")
fixes a bug in 1dd214b8f21c and there is a similar bug in d9dddbf55667 that
can be fixed in a similar way too.
In addition, for RISC-V arch the first 2MB RAM could be reserved for opensbi,
so it would have pfn_base=512 and mem_map began with 512th PFN when
CONFIG_FLATMEM=y.
But __find_buddy_pfn algorithm thinks the start pfn 0, it could get 0 pfn or
less than the pfn_base value. We need page_is_buddy() to verify the buddy to
prevent accessing an invalid buddy.
Fixes: d9dddbf55667 ("mm/page_alloc: prevent merging between isolated and other pageblocks")
Cc: stable@vger.kernel.org
Reported-by: zjb194813@alibaba-inc.com
Reported-by: tianhu.hh@alibaba-inc.com
Signed-off-by: Xianting Tian <xianting.tian@linux.alibaba.com>
---
mm/page_alloc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index a6e682569e5b..1c423faa4b62 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -864,6 +864,9 @@ static inline void __free_one_page(struct page *page,
buddy_idx = __find_buddy_index(page_idx, order);
buddy = page + (buddy_idx - page_idx);
+
+ if (!page_is_buddy(page, buddy, order))
+ goto done_merging;
buddy_mt = get_pageblock_migratetype(buddy);
if (migratetype != buddy_mt
--
2.17.1
next reply other threads:[~2022-06-16 16:18 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-16 16:17 Xianting Tian [this message]
2022-06-16 16:17 ` [PATCH 4.14] " Xianting Tian
2022-06-16 16:17 ` [PATCH 4.19] " Xianting Tian
2022-06-16 16:17 ` [PATCH 5.4] " Xianting Tian
2022-06-16 16:17 ` [PATCH 5.10] " Xianting Tian
2022-06-16 16:17 ` [PATCH 5.15] mm: " Xianting Tian
2022-06-20 10:17 ` Greg KH
2022-06-20 10:54 ` Xianting Tian
2022-06-20 11:42 ` Greg KH
2022-06-20 11:57 ` Xianting Tian
2022-06-20 12:06 ` Greg KH
2022-06-20 12:18 ` Xianting Tian
2022-06-20 12:24 ` Greg KH
2022-06-20 12:41 ` Xianting Tian
2022-06-20 12:45 ` Zi Yan
2022-06-20 12:54 ` Greg KH
2022-06-20 14:13 ` Zi Yan
2022-06-20 20:31 ` Greg KH
2022-06-22 1:37 ` Xianting Tian
2022-06-22 1:52 ` Zi Yan
2022-07-06 2:51 ` Xianting Tian
2022-06-20 12:25 ` Zi Yan
2022-06-16 16:17 ` [PATCH 5.17] " Xianting Tian
2022-06-16 16:20 ` [PATCH] mm: page_alloc: " Xianting Tian
2022-06-16 16:50 ` Greg KH
2022-06-17 1:24 ` Xianting Tian
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=20220616161746.3565225-1-xianting.tian@linux.alibaba.com \
--to=xianting.tian@linux.alibaba.com \
--cc=akpm@linux-foundation.org \
--cc=gregkh@linuxfoundation.org \
--cc=guohanjun@huawei.com \
--cc=guoren@kernel.org \
--cc=huanyi.xj@alibaba-inc.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=stable@vger.kernel.org \
--cc=tianhu.hh@alibaba-inc.com \
--cc=ziy@nvidia.com \
--cc=zjb194813@alibaba-inc.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