From: Tejun Heo <tj@kernel.org>
Date: Thu, 18 Feb 2016 16:44:24 +0000 (-0500)
Subject: cgroup: fix alloc_cgroup_ns() error handling in copy_cgroup_ns()
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=d22025570e2ebfc68819b35c5d457e53d9337217;p=deliverable%2Flinux.git

cgroup: fix alloc_cgroup_ns() error handling in copy_cgroup_ns()

alloc_cgroup_ns() returns an ERR_PTR value on error but
copy_cgroup_ns() was checking for NULL for error.  Fix it.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
---

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index afb1205fc789..d92d91a4bb3e 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -6083,10 +6083,11 @@ struct cgroup_namespace *copy_cgroup_ns(unsigned long flags,
 	spin_unlock_bh(&css_set_lock);
 	mutex_unlock(&cgroup_mutex);
 
-	err = -ENOMEM;
 	new_ns = alloc_cgroup_ns();
-	if (!new_ns)
+	if (IS_ERR(new_ns)) {
+		err = PTR_ERR(new_ns);
 		goto err_out;
+	}
 
 	new_ns->user_ns = get_user_ns(user_ns);
 	new_ns->root_cset = cset;