Skip to content

Commit 8bcd8dd

Browse files
Matthew Wilcoxjb-essential
authored andcommitted
mm/filemap.c: fix NULL pointer in page_cache_tree_insert()
commit abc1be13fd113ddef5e2d807a466286b864caed3 upstream. f2fs specifies the __GFP_ZERO flag for allocating some of its pages. Unfortunately, the page cache also uses the mapping's GFP flags for allocating radix tree nodes. It always masked off the __GFP_HIGHMEM flag, and masks off __GFP_ZERO in some paths, but not all. That causes radix tree nodes to be allocated with a NULL list_head, which causes backtraces like: __list_del_entry+0x30/0xd0 list_lru_del+0xac/0x1ac page_cache_tree_insert+0xd8/0x110 The __GFP_DMA and __GFP_DMA32 flags would also be able to sneak through if they are ever used. Fix them all by using GFP_RECLAIM_MASK at the innermost location, and remove it from earlier in the callchain. Link: http://lkml.kernel.org/r/[email protected] Fixes: 449dd69 ("mm: keep page cache radix tree nodes in check") Signed-off-by: Matthew Wilcox <[email protected]> Reported-by: Chris Fries <[email protected]> Debugged-by: Minchan Kim <[email protected]> Acked-by: Johannes Weiner <[email protected]> Acked-by: Michal Hocko <[email protected]> Reviewed-by: Jan Kara <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 06e8b42 commit 8bcd8dd

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

mm/filemap.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask)
573573
VM_BUG_ON_PAGE(!PageLocked(new), new);
574574
VM_BUG_ON_PAGE(new->mapping, new);
575575

576-
error = radix_tree_preload(gfp_mask & ~__GFP_HIGHMEM);
576+
error = radix_tree_preload(gfp_mask & GFP_RECLAIM_MASK);
577577
if (!error) {
578578
struct address_space *mapping = old->mapping;
579579
void (*freepage)(struct page *);
@@ -632,7 +632,7 @@ static int __add_to_page_cache_locked(struct page *page,
632632
return error;
633633
}
634634

635-
error = radix_tree_maybe_preload(gfp_mask & ~__GFP_HIGHMEM);
635+
error = radix_tree_maybe_preload(gfp_mask & GFP_RECLAIM_MASK);
636636
if (error) {
637637
if (!huge)
638638
mem_cgroup_cancel_charge(page, memcg);
@@ -1194,8 +1194,7 @@ struct page *pagecache_get_page(struct address_space *mapping, pgoff_t offset,
11941194
if (fgp_flags & FGP_ACCESSED)
11951195
__SetPageReferenced(page);
11961196

1197-
err = add_to_page_cache_lru(page, mapping, offset,
1198-
gfp_mask & GFP_RECLAIM_MASK);
1197+
err = add_to_page_cache_lru(page, mapping, offset, gfp_mask);
11991198
if (unlikely(err)) {
12001199
page_cache_release(page);
12011200
page = NULL;
@@ -1840,7 +1839,7 @@ static int page_cache_read(struct file *file, pgoff_t offset, gfp_t gfp_mask)
18401839
if (!page)
18411840
return -ENOMEM;
18421841

1843-
ret = add_to_page_cache_lru(page, mapping, offset, gfp_mask & GFP_KERNEL);
1842+
ret = add_to_page_cache_lru(page, mapping, offset, gfp_mask);
18441843
if (ret == 0)
18451844
ret = mapping->a_ops->readpage(file, page);
18461845
else if (ret == -EEXIST)

0 commit comments

Comments
 (0)