cgroup: Protect css->cgroup write under css_set_lock
PATCH 1/1 cgroup: Protect css->cgroup write under css_set_lock
The writing of css->cgroup associated with the cgroup root in rebind_subsystems() is currently protected only by cgroup_mutex. However, the reading of css->cgroup in both proc_cpuset_show() and proc_cgroup_show() is protected just by css_set_lock. That makes the readers susceptible to racing problems like data tearing or caching. It is also a problem that can be reported by KCSAN.
This can be fixed by using READ_ONCE() and WRITE_ONCE() to access css->cgroup. Alternatively, the writing of css->cgroup can be moved under css_set_lock as well which is done by this patch.
--- kernel/cgroup/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/cgroup/cgroup.c +1 -1
@@ -1842,9 +1842,9 @@ int rebind_subsystems(struct cgroup_root *dst_root, u16 ss_mask)RCU_INIT_POINTER (scgrp->subsys[ssid],NULL );rcu_assign_pointer (dcgrp->subsys[ssid], css); ss->root = dst_root; - css->cgroup = dcgrp;spin_lock_irq (&css_set_lock); + css->cgroup = dcgrp;WARN_ON (!list_empty (&dcgrp->e_csets[ss->id]));list_for_each_entry_safe (cset, cset_pos, &scgrp->e_csets[ss->id], e_cset_node[ss->id]) {
Signature · 1 line
2.39.3
Quoted 7 lines · Waiman Long
The writing of
css->cgroupassociated with the cgroup root inrebind_subsystems()is currently protected only bycgroup_mutex. However, the reading ofcss->cgroupin bothproc_cpuset_show()andproc_cgroup_show()is protected just bycss_set_lock. That makes the readers susceptible to racing problems like data tearing or caching. It is also a problem that can be reported by KCSAN.
Quoted 5 lines
This can be fixed by using
READ_ONCE()andWRITE_ONCE()to accesscss->cgroup. Alternatively, the writing ofcss->cgroupcan be moved undercss_set_lockas well which is done by this patch.Signed-off-by Waiman Long <[email protected]>
Applied to cgroup/for-6.10-fixes.
Thanks.
Signature · 1 line
tejun