diff mbox series

[linux-next] mm/folio-compat: fix potential NULL pointer access

Message ID 20210913081113.79975-1-xu.xin16@zte.com.cn (mailing list archive)
State New
Headers show
Series [linux-next] mm/folio-compat: fix potential NULL pointer access | expand

Commit Message

CGEL Sept. 13, 2021, 8:11 a.m. UTC 
From: xu xin <xu.xin16@zte.com.cn>

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@zte.com.cn>
Signed-off-by: xu xin <xu.xin16@zte.com.cn>
---
 mm/folio-compat.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Matthew Wilcox Oct. 9, 2021, 7:35 p.m. UTC | #1 
On Mon, Sep 13, 2021 at 08:11:13AM +0000, cgel.zte@gmail.com wrote:
> From: xu xin <xu.xin16@zte.com.cn>
> 
> 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@zte.com.cn>

Your robot is garbage.

>  	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;

&folio->page *does not access folio*.  It does pointer arithmetic on
folio.  Specifically, it adds zero to folio, because page is the first
element of folio.

Secondly, __filemap_get_folio() absolutely can return an xa_is_value()
result if FGP_ENTRY entry is set.  It's right there in the first few
lines:

        folio = mapping_get_entry(mapping, index);
        if (xa_is_value(folio)) {
                if (fgp_flags & FGP_ENTRY)
                        return folio;
diff mbox series

Patch

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);
 }