From: Alex Williamson <alex.williamson@redhat.com>
Cc: Alex Williamson <alex.williamson@redhat.com>,
Salvatore Bonaccorso <carnil@debian.org>,
Milan Broz <gmazyland@gmail.com>,
stable@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, Sasha Levin <sashal@kernel.org>
Subject: [PATCH stable 6.1] mm: Fix is_zero_page() usage in try_grab_page()
Date: Wed, 16 Apr 2025 14:24:39 -0600 [thread overview]
Message-ID: <20250416202441.3911142-1-alex.williamson@redhat.com> (raw)
The backport of upstream commit c8070b787519 ("mm: Don't pin ZERO_PAGE
in pin_user_pages()") into v6.1.130 noted below in Fixes does not
account for commit 0f0892356fa1 ("mm: allow multiple error returns in
try_grab_page()"), which changed the return value of try_grab_page()
from bool to int. Therefore returning 0, success in the upstream
version, becomes an error here. Fix the return value.
Fixes: 476c1dfefab8 ("mm: Don't pin ZERO_PAGE in pin_user_pages()")
Link: https://lore.kernel.org/all/Z_6uhLQjJ7SSzI13@eldamar.lan
Reported-by: Salvatore Bonaccorso <carnil@debian.org>
Reported-by: Milan Broz <gmazyland@gmail.com>
Cc: stable@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
mm/gup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/gup.c b/mm/gup.c
index b1daaa9d89aa..76a2b0943e2d 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -232,7 +232,7 @@ bool __must_check try_grab_page(struct page *page, unsigned int flags)
* and it is used in a *lot* of places.
*/
if (is_zero_page(page))
- return 0;
+ return true;
/*
* Similar to try_grab_folio(): be sure to *also*
--
2.48.1
next reply other threads:[~2025-04-16 20:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-16 20:24 Alex Williamson [this message]
2025-04-16 21:49 ` Salvatore Bonaccorso
2025-04-22 8:01 ` Greg KH
2025-04-17 7:12 ` David Hildenbrand
2025-04-22 8:05 ` Patch "mm: Fix is_zero_page() usage in try_grab_page()" has been added to the 6.1-stable tree gregkh
2025-04-22 8:47 ` David Hildenbrand
2025-04-22 9:02 ` Greg KH
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=20250416202441.3911142-1-alex.williamson@redhat.com \
--to=alex.williamson@redhat.com \
--cc=carnil@debian.org \
--cc=gmazyland@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.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