summaryrefslogtreecommitdiffstats
path: root/kernel/cgroup.c
diff options
context:
space:
mode:
authorZefan Li <lizefan@huawei.com>2014-09-20 08:35:43 +0200
committerTejun Heo <tj@kernel.org>2014-09-20 18:23:35 +0200
commit3e2cd91ab92665148616a80dc0745c499d2746a7 (patch)
treed9deebb021eb70e509f0c44b4094bc18509ea036 /kernel/cgroup.c
parentcgroup: remove CGRP_RELEASABLE flag (diff)
downloadlinux-3e2cd91ab92665148616a80dc0745c499d2746a7.tar.xz
linux-3e2cd91ab92665148616a80dc0745c499d2746a7.zip
cgroup: fix missing unlock in cgroup_release_agent()
The patch 971ff4935538: "cgroup: use a per-cgroup work for release agent" from Sep 18, 2014, leads to the following static checker warning: kernel/cgroup.c:5310 cgroup_release_agent() warn: 'mutex:&cgroup_mutex' is sometimes locked here and sometimes unlocked. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Zefan Li <lizefan@huawei.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r--kernel/cgroup.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 16e3a4f5c9dc..f873c4681316 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -5291,7 +5291,10 @@ static void cgroup_release_agent(struct work_struct *work)
mutex_unlock(&cgroup_mutex);
call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC);
+ goto out_free;
out:
+ mutex_unlock(&cgroup_mutex);
+out_free:
kfree(agentbuf);
kfree(pathbuf);
}