mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 02:21:52 +09:00
UPSTREAM: mm: Fix is_zero_page() usage in try_grab_page()
The backport of upstream commitc8070b7875("mm: Don't pin ZERO_PAGE in pin_user_pages()") into v6.1.130 noted below in Fixes does not account for commit0f0892356f("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. Bug: 411256892 Fixes:476c1dfefa("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> Reviewed-by: David Hildenbrand <david@redhat.com> Cc: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org Cc: Sasha Levin <sashal@kernel.org> Change-Id: I1a124e70161e48c9b3374aa3fc541c6a13ea1ff0 Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commitedde34b792) Signed-off-by: Will McVicker <willmcvicker@google.com>
This commit is contained in:
committed by
William McVicker
parent
53b26534cc
commit
3cd01bb5bd
2
mm/gup.c
2
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.
|
* and it is used in a *lot* of places.
|
||||||
*/
|
*/
|
||||||
if (is_zero_page(page))
|
if (is_zero_page(page))
|
||||||
return 0;
|
return true;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Similar to try_grab_folio(): be sure to *also*
|
* Similar to try_grab_folio(): be sure to *also*
|
||||||
|
|||||||
Reference in New Issue
Block a user