[PATCH] userns: fix return value on mntns_install() failure

[PATCH] userns: fix return value on mntns_install() failure

[Zhao Hongjiang]

From: Zhao Hongjiang <zhaohongjiang-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>

Change return value from -EINVAL to -EPERM when the permission check fails.

Signed-off-by: Zhao Hongjiang <zhaohongjiang-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
---
 fs/namespace.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/namespace.c b/fs/namespace.c
index 72be266..1e79d20 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -2764,7 +2764,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)

 	if (!ns_capable(mnt_ns->user_ns, CAP_SYS_ADMIN) ||
 	    !nsown_capable(CAP_SYS_CHROOT))
-		return -EINVAL;
+		return -EPERM;

 	if (fs->users != 1)
 		return -EINVAL;
-- 1.7.1

Re: [PATCH] userns: fix return value on mntns_install() failure

[Serge Hallyn]

Quoting Zhao Hongjiang (zhaohongjiang37-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org):
> From: Zhao Hongjiang <zhaohongjiang-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
> 
> Change return value from -EINVAL to -EPERM when the permission check fails.
> 
> Signed-off-by: Zhao Hongjiang <zhaohongjiang-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>

That also matches what other *_install do.

Acked-by: Serge E. Hallyn <serge.hallyn-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>

> ---
>  fs/namespace.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/namespace.c b/fs/namespace.c
> index 72be266..1e79d20 100644
> --- a/fs/namespace.c
> +++ b/fs/namespace.c
> @@ -2764,7 +2764,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
> 
>  	if (!ns_capable(mnt_ns->user_ns, CAP_SYS_ADMIN) ||
>  	    !nsown_capable(CAP_SYS_CHROOT))
> -		return -EINVAL;
> +		return -EPERM;
> 
>  	if (fs->users != 1)
>  		return -EINVAL;
> -- 1.7.1
> _______________________________________________
> Containers mailing list
> Containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
> https://lists.linuxfoundation.org/mailman/listinfo/containers

Re: [PATCH] userns: fix return value on mntns_install() failure

[Eric W. Biederman]

Zhao Hongjiang <zhaohongjiang37-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> writes:

> From: Zhao Hongjiang <zhaohongjiang-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
>
> Change return value from -EINVAL to -EPERM when the permission check
> fails.

Thanks applied.

Eric