Commit 61718867 authored by Kamalesh Babulal's avatar Kamalesh Babulal Committed by Chen Ridong
Browse files

cgroup: Check for ret during cgroup1_base_files cft addition 

mainline inclusion
from mainline-v6.7-rc1
commit fd55c0adb46a44c9a0630dc32509e4733c290103
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I91BXW



----------------------------------------------------------------------

There is no check for possible failure while populating
cgroup1_base_files cft in css_populate_dir(), like its cgroup v2 counter
parts cgroup_{base,psi}_files.  In case of failure, the cgroup might not
be set up right.  Add ret value check to return on failure.

Signed-off-by: default avatarKamalesh Babulal <kamalesh.babulal@oracle.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarChen Ridong <chenridong@huawei.com>
parent fa30d756

kernel/cgroup/cgroup.c

+4 −2
Original line number Diff line number Diff line
@@ -1733,8 +1733,10 @@ static int css_populate_dir(struct cgroup_subsys_state *css) 
					return ret;

			}

		} else {

			cgroup_addrm_files(css, cgrp,

			ret = cgroup_addrm_files(css, cgrp,

						 cgroup1_base_files, true);

			if (ret < 0)

				return ret;

		}

	} else {

		list_for_each_entry(cfts, &css->ss->cfts, node) {