Re: [PATCH cgroup/for-4.5-fixes] cgroup: fix alloc_cgroup_ns() error handling in copy_cgroup_ns()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Thanks for catching.

On Thu, Feb 18, 2016 at 8:46 AM, Tejun Heo <tj@xxxxxxxxxx> wrote:
> From d22025570e2ebfc68819b35c5d457e53d9337217 Mon Sep 17 00:00:00 2001
> From: Tejun Heo <tj@xxxxxxxxxx>
> Date: Thu, 18 Feb 2016 11:44:24 -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@xxxxxxxxxx>
> Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>

Acked-by: Aditya Kali (adityakali@xxxxxxxxxx)

> ---
> Hello, Dan.
>
> Applied to cgroup/for-4.5-fixes.
>
> Thanks.
>
>  kernel/cgroup.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/cgroup.c b/kernel/cgroup.c
> index afb1205..d92d91a 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;
> --
> 2.5.0
>



-- 
Aditya
--
To unsubscribe from this list: send the line "unsubscribe cgroups" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux OMAP]     [Linux MIPS]     [eCos]     [Asterisk Internet PBX]     [Linux API]     [Monitors]

  Powered by Linux