iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cgroup: don't put ERR_PTR() into fc->root

Browse Source 
the caller of ->get_tree() expects NULL left there on error...

Reported-by: Thibaut Sautereau <thibaut@sautereau.fr>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2019-11-10 11:53:27 -05:00
parent 03ad0d703d
commit 630faf81b3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/cgroup/cgroup.c
View File

@ -2119,11 +2119,12 @@ int cgroup_do_get_tree(struct fs_context *fc)
nsdentry = kernfs_node_dentry(cgrp->kn, sb); nsdentry = kernfs_node_dentry(cgrp->kn, sb);
dput(fc->root); dput(fc->root);
fc->root = nsdentry;
if (IS_ERR(nsdentry)) { if (IS_ERR(nsdentry)) {
ret = PTR_ERR(nsdentry);
deactivate_locked_super(sb); deactivate_locked_super(sb);
ret = PTR_ERR(nsdentry);
nsdentry = NULL;
} }
fc->root = nsdentry;
} }
if (!ctx->kfc.new_sb_created) if (!ctx->kfc.new_sb_created)