[PATCH linux-next] mm/folio-compat: fix potential NULL pointer access
From: cgel . zte
Date: Mon Sep 13 2021 - 04:11:25 EST
From: xu xin <xu.xin16@xxxxxxxxxx>
The pointer 'folio' might be NULL, but the structure it points to is accessed.
Accordingly, we add a check of NULL pointer by 'if (!folio)'.
Secondly, there is no need to check if folio is pointer or value with 'xa_is_value(folio)'
because folio is alwayse pointer.
Reported-by: Zeal Robot <zealci@xxxxxxxxxx>
Signed-off-by: xu xin <xu.xin16@xxxxxxxxxx>
---
mm/folio-compat.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mm/folio-compat.c b/mm/folio-compat.c
index 5b6ae1da314e..a1b60310c7ba 100644
--- a/mm/folio-compat.c
+++ b/mm/folio-compat.c
@@ -123,7 +123,9 @@ struct page *pagecache_get_page(struct address_space *mapping, pgoff_t index,
struct folio *folio;
folio = __filemap_get_folio(mapping, index, fgp_flags, gfp);
- if ((fgp_flags & FGP_HEAD) || !folio || xa_is_value(folio))
+ if (!folio)
+ return NULL;
+ if ((fgp_flags & FGP_HEAD))
return &folio->page;
return folio_file_page(folio, index);
}
--
2.25.1