[1/2] cgroup: Check for ret during cgroup1_base_files cft addition

Message ID 96694dfc5f4caf4d84a740c3b18b0a456c9ff522.1694501024.git.kamalesh.babulal@oracle.com
State New
Headers
Series [1/2] cgroup: Check for ret during cgroup1_base_files cft addition |

Commit Message

Kamalesh Babulal Sept. 12, 2023, 7:04 a.m. UTC
  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: Kamalesh Babulal <kamalesh.babulal@oracle.com>
---
 kernel/cgroup/cgroup.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


base-commit: 0bb80ecc33a8fb5a682236443c1e740d5c917d1d
  

Comments

Tejun Heo Sept. 18, 2023, 6:57 p.m. UTC | #1
On Tue, Sep 12, 2023 at 12:34:34PM +0530, Kamalesh Babulal wrote:
> 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: Kamalesh Babulal <kamalesh.babulal@oracle.com>

Applied to cgroup/for-6.7 with double spaces removed.

Thanks.
  

Patch

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 1fb7f562289d..a6b1ea324b0e 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -1731,8 +1731,10 @@  static int css_populate_dir(struct cgroup_subsys_state *css)
 					return ret;
 			}
 		} else {
-			cgroup_addrm_files(css, cgrp,
-					   cgroup1_base_files, true);
+			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) {