From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
"Borah, Chaitanya Kumar" <chaitanya.kumar.borah@intel.com>
Subject: [PATCH] mm: Fix list corruption in put_pages_list
Date: Wed, 6 Mar 2024 21:27:30 +0000 [thread overview]
Message-ID: <20240306212749.1823380-1-willy@infradead.org> (raw)
My recent change to put_pages_list() dereferences folio->lru.next after
returning the folio to the page allocator. Usually this is now on the
pcp list with other free folios, so we try to free an already-free
folio. This only happens with lists that have more than 15 entries, so
it wasn't immediately discovered. Revert to using list_for_each_safe()
so we dereference lru.next before disposing of the folio.
Reported-by: "Borah, Chaitanya Kumar" <chaitanya.kumar.borah@intel.com>
Fixes: 24835f899c01 (mm: use free_unref_folios() in put_pages_list())
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
mm/swap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/swap.c b/mm/swap.c
index a910af21ba68..1d4b7713605d 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -139,10 +139,10 @@ EXPORT_SYMBOL(__folio_put);
void put_pages_list(struct list_head *pages)
{
struct folio_batch fbatch;
- struct folio *folio;
+ struct folio *folio, *next;
folio_batch_init(&fbatch);
- list_for_each_entry(folio, pages, lru) {
+ list_for_each_entry_safe(folio, next, pages, lru) {
if (!folio_put_testzero(folio))
continue;
if (folio_test_hugetlb(folio)) {
--
2.43.0
next reply other threads:[~2024-03-06 21:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-06 21:27 Matthew Wilcox (Oracle) [this message]
2024-03-06 21:45 ` Andrew Morton
2024-03-06 21:47 ` Matthew Wilcox
2024-03-06 21:59 ` Andrew Morton
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=20240306212749.1823380-1-willy@infradead.org \
--to=willy@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=chaitanya.kumar.borah@intel.com \
--cc=linux-mm@kvack.org \
/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