summaryrefslogtreecommitdiffstats
path: root/fs/namespace.c
diff options
context:
space:
mode:
authorZhao Hongjiang <zhaohongjiang@huawei.com>2012-09-13 16:38:03 +0800
committerEric W. Biederman <ebiederm@xmission.com>2012-11-19 05:59:22 -0800
commitae11e0f18482bfe0cd83b9b61434ea7e0bd94e25 (patch)
tree13356ea5b2a0316b1daf2661adeec05b0d5f78b2 /fs/namespace.c
parent0c55cfc4166d9a0f38de779bd4d75a90afbe7734 (diff)
downloadlinux-stable-ae11e0f18482bfe0cd83b9b61434ea7e0bd94e25.tar.gz
linux-stable-ae11e0f18482bfe0cd83b9b61434ea7e0bd94e25.tar.bz2
linux-stable-ae11e0f18482bfe0cd83b9b61434ea7e0bd94e25.zip
userns: fix return value on mntns_install() failure
Change return value from -EINVAL to -EPERM when the permission check fails. Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'fs/namespace.c')
-rw-r--r--fs/namespace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index 9ddc86f93221..cab78a74aca3 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -2775,7 +2775,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;