cgroup: fix alloc_cgroup_ns() error handling in copy_cgroup_ns()
authorTejun Heo <tj@kernel.org>
Thu, 18 Feb 2016 16:44:24 +0000 (11:44 -0500)
committerTejun Heo <tj@kernel.org>
Thu, 18 Feb 2016 16:44:24 +0000 (11:44 -0500)
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>
kernel/cgroup.c

index afb1205..d92d91a 100644 (file)
@@ -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;