Unverified Commit 41d0180b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4778 v3 Revert "memcg: fix a UAF problem in drain_all_stock()" 

Merge Pull Request from: @ci-robot 
 
PR sync from: "GONG, Ruiqi" <gongruiqi1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/DS45SDBWABUHIH747GD7372URU2LCCXJ/ 
 
https://gitee.com/openeuler/kernel/issues/I7Z1ZU 
 
Link:https://gitee.com/openeuler/kernel/pulls/4778

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents a828e118 e87f89e9

mm/memcontrol.c

+2 −1
Original line number Diff line number Diff line
@@ -2232,7 +2232,8 @@ static void drain_all_stock(struct mem_cgroup *root_memcg) 


		rcu_read_lock();

		memcg = stock->cached;

		if (memcg && mem_cgroup_is_descendant(memcg, root_memcg))

		if (memcg && stock->nr_pages &&

		    mem_cgroup_is_descendant(memcg, root_memcg))

			flush = true;

		rcu_read_unlock();