Skip to contentSkip to conversation

mm/memcontrol: fix obj_cgroup leak in mem_cgroup_css_online() error path

PATCH In review David Carlier 1 participant 2 messages Mar 23

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm/memcontrol: fix obj_cgroup leak in mem_cgroup_css_online() error path

When obj_cgroup_alloc() fails partway through the NUMA node loop in mem_cgroup_css_online(), the free_objcg error path drops the extra reference held by pn->orig_objcg but never kills the initial percpu_ref from obj_cgroup_alloc() stored in pn->objcg.

Since css_offline is never called when css_online fails, memcg_reparent_objcgs() never runs, so the percpu_ref_kill() that normally drops this initial reference never executes. The obj_cgroup and its per-cpu ref allocations are leaked.

Clear pn->objcg via rcu_replace_pointer() and add the missing percpu_ref_kill() in the error path, matching the normal teardown sequence in memcg_reparent_objcgs().

Also add a NULL check for pn in __mem_cgroup_free() to prevent a NULL pointer dereference when alloc_mem_cgroup_per_node_info() fails partway through the node loop in mem_cgroup_alloc().

Fixes 098fad3e1621 ("mm: memcontrol: convert objcg to be per-memcg per-node type")
---
 mm/memcontrol.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
mm/memcontrol.c +7 -1
index a47fb68dd65f..e361f42464ef 100644
@@ -3936,6 +3936,8 @@ static void __mem_cgroup_free(struct mem_cgroup *memcg)
 
 	for_each_node(node) {
 		struct mem_cgroup_per_node *pn = memcg->nodeinfo[node];
+		if (!pn)
+			continue;
 
 		obj_cgroup_put(pn->orig_objcg);
 		free_mem_cgroup_per_node_info(pn);
@@ -4137,8 +4139,12 @@ static int mem_cgroup_css_online(struct cgroup_subsys_state *css)
 free_objcg:
 	for_each_node(nid) {
 		struct mem_cgroup_per_node *pn = memcg->nodeinfo[nid];
+		objcg = rcu_replace_pointer(pn->objcg, NULL, true);
+
+		if (objcg)
+			percpu_ref_kill(&objcg->refcnt);
 
-		if (pn && pn->orig_objcg) {
+		if (pn->orig_objcg) {
 			obj_cgroup_put(pn->orig_objcg);
 			/*
 			 * Reset pn->orig_objcg to NULL to prevent
Signature · 1 line
2.53.0
#1 lore raw

please ignore I resent to the same subject

Quoted 55 lines · David Carlier

When obj_cgroup_alloc() fails partway through the NUMA node loop in mem_cgroup_css_online(), the free_objcg error path drops the extra reference held by pn->orig_objcg but never kills the initial percpu_ref from obj_cgroup_alloc() stored in pn->objcg.

Since css_offline is never called when css_online fails, memcg_reparent_objcgs() never runs, so the percpu_ref_kill() that normally drops this initial reference never executes. The obj_cgroup and its per-cpu ref allocations are leaked.

Clear pn->objcg via rcu_replace_pointer() and add the missing percpu_ref_kill() in the error path, matching the normal teardown sequence in memcg_reparent_objcgs().

Also add a NULL check for pn in __mem_cgroup_free() to prevent a NULL pointer dereference when alloc_mem_cgroup_per_node_info() fails partway through the node loop in mem_cgroup_alloc().

Fixes 098fad3e1621 ("mm: memcontrol: convert objcg to be per-memcg per-node type")
---
 mm/memcontrol.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
mm/memcontrol.c +7 -2
index a47fb68dd65f..e361f42464ef 100644
@@ -3936,6 +3936,8 @@ static void __mem_cgroup_free(struct mem_cgroup *memcg)
 
        for_each_node(node) {
                struct mem_cgroup_per_node *pn = memcg->nodeinfo[node];
+               if (!pn)
+                       continue;
 
                obj_cgroup_put(pn->orig_objcg);
                free_mem_cgroup_per_node_info(pn);
@@ -4137,8 +4139,12 @@ static int mem_cgroup_css_online(struct cgroup_subsys_state *css)
 free_objcg:
        for_each_node(nid) {
                struct mem_cgroup_per_node *pn = memcg->nodeinfo[nid];
+               objcg = rcu_replace_pointer(pn->objcg, NULL, true);
+
+               if (objcg)
+                       percpu_ref_kill(&objcg->refcnt);
 
-               if (pn && pn->orig_objcg) {
+               if (pn->orig_objcg) {
                        obj_cgroup_put(pn->orig_objcg);
                        /*
                         * Reset pn->orig_objcg to NULL to prevent
--

2.53.0