Skip to content

Commit ac86f54

Browse files
Kefeng Wangakpm00
authored andcommitted
mm: memcg: fix NULL pointer in mem_cgroup_track_foreign_dirty_slowpath()
As commit 1836522 ("hwpoison, memcg: forcibly uncharge LRU pages"), hwpoison will forcibly uncharg a LRU hwpoisoned page, the folio_memcg could be NULl, then, mem_cgroup_track_foreign_dirty_slowpath() could occurs a NULL pointer dereference, let's do not record the foreign writebacks for folio memcg is null in mem_cgroup_track_foreign_dirty() to fix it. Link: https://lkml.kernel.org/r/[email protected] Fixes: 97b2782 ("writeback, memcg: Implement foreign dirty flushing") Signed-off-by: Kefeng Wang <[email protected]> Reported-by: Ma Wupeng <[email protected]> Tested-by: Miko Larsson <[email protected]> Acked-by: Michal Hocko <[email protected]> Cc: Jan Kara <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Kefeng Wang <[email protected]> Cc: Ma Wupeng <[email protected]> Cc: Naoya Horiguchi <[email protected]> Cc: Shakeel Butt <[email protected]> Cc: Tejun Heo <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 1e90e35 commit ac86f54

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

include/linux/memcontrol.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1666,10 +1666,13 @@ void mem_cgroup_track_foreign_dirty_slowpath(struct folio *folio,
16661666
static inline void mem_cgroup_track_foreign_dirty(struct folio *folio,
16671667
struct bdi_writeback *wb)
16681668
{
1669+
struct mem_cgroup *memcg;
1670+
16691671
if (mem_cgroup_disabled())
16701672
return;
16711673

1672-
if (unlikely(&folio_memcg(folio)->css != wb->memcg_css))
1674+
memcg = folio_memcg(folio);
1675+
if (unlikely(memcg && &memcg->css != wb->memcg_css))
16731676
mem_cgroup_track_foreign_dirty_slowpath(folio, wb);
16741677
}
16751678

0 commit comments

Comments
 (0)