[RESEND][PATCH] userns: use marco instead of magic number for max userns level

[RESEND][PATCH] userns: use marco instead of magic number for max userns level

[Chen Hanxiao]

Use marco instead of magic number
for max user namespace level.

Signed-off-by: Chen Hanxiao <chenhanxiao-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
---
 kernel/user_namespace.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index aa312b0..5435489 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -47,6 +47,8 @@ static void set_cred_user_ns(struct cred *cred, struct user_namespace *user_ns)
 	cred->user_ns = user_ns;
 }
 
+#define MAX_USER_NS_LEVEL 32
+
 /*
  * Create a new user namespace, deriving the creator from the user in the
  * passed credentials, and replacing that user with the new root user for the
@@ -62,7 +64,7 @@ int create_user_ns(struct cred *new)
 	kgid_t group = new->egid;
 	int ret;
 
-	if (parent_ns->level > 32)
+	if (parent_ns->level > MAX_USER_NS_LEVEL)
 		return -EUSERS;
 
 	/*
-- 
1.9.0

Re: [RESEND][PATCH] userns: use marco instead of magic number for max userns level

[Serge Hallyn]

Quoting Chen Hanxiao (chenhanxiao-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org):
> Use marco instead of magic number
> for max user namespace level.
> 
> Signed-off-by: Chen Hanxiao <chenhanxiao-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>

Acked-by: Serge E. Hallyn <serge.hallyn-GeWIH/nMZzLQT0dZR+AlfA@public.gmane.org>

> ---
>  kernel/user_namespace.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
> index aa312b0..5435489 100644
> --- a/kernel/user_namespace.c
> +++ b/kernel/user_namespace.c
> @@ -47,6 +47,8 @@ static void set_cred_user_ns(struct cred *cred, struct user_namespace *user_ns)
>  	cred->user_ns = user_ns;
>  }
>  
> +#define MAX_USER_NS_LEVEL 32
> +
>  /*
>   * Create a new user namespace, deriving the creator from the user in the
>   * passed credentials, and replacing that user with the new root user for the
> @@ -62,7 +64,7 @@ int create_user_ns(struct cred *new)
>  	kgid_t group = new->egid;
>  	int ret;
>  
> -	if (parent_ns->level > 32)
> +	if (parent_ns->level > MAX_USER_NS_LEVEL)
>  		return -EUSERS;
>  
>  	/*
> -- 
> 1.9.0
> 
> _______________________________________________
> Containers mailing list
> Containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
> https://lists.linuxfoundation.org/mailman/listinfo/containers

Re: [RESEND][PATCH] userns: use marco instead of magic number for max userns level

[Aristeu Rozanski]

On Thu, Sep 11, 2014 at 05:51:31PM +0800, Chen Hanxiao wrote:
> Use marco instead of magic number
> for max user namespace level.

patch is ok, but you might want to do s/marco/macro/

-- 
Aristeu

RE: [RESEND][PATCH] userns: use marco instead of magic number for max userns level

[Chen, Hanxiao]

> -----Original Message-----
> From: Aristeu Rozanski [mailto:aris-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org]
> 
> On Thu, Sep 11, 2014 at 05:51:31PM +0800, Chen Hanxiao wrote:
> > Use marco instead of magic number
> > for max user namespace level.
> 
> patch is ok, but you might want to do s/marco/macro/
> 
Sorry for that typo..
Do I need to resend it?

Thanks,
- Chen