diff options
| author | Eric W. Biederman | 2014-10-08 02:11:46 +0200 |
|---|---|---|
| committer | Eric W. Biederman | 2014-12-02 17:46:50 +0100 |
| commit | 381cacb12c009864993a072eedcc0720315aedbd (patch) | |
| tree | 0dae00dad627d93c9ac98a04e9ea8210a6a0dde4 /fs | |
| parent | mnt: Move the clear of MNT_LOCKED from copy_tree to it's callers. (diff) | |
| download | kernel-qcow2-linux-381cacb12c009864993a072eedcc0720315aedbd.tar.gz kernel-qcow2-linux-381cacb12c009864993a072eedcc0720315aedbd.tar.xz kernel-qcow2-linux-381cacb12c009864993a072eedcc0720315aedbd.zip | |
mnt: Carefully set CL_UNPRIVILEGED in clone_mnt
old->mnt_expiry should be ignored unless CL_EXPIRE is set.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namespace.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index e8d1ffa7f132..f87a90b98da2 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -963,7 +963,8 @@ static struct mount *clone_mnt(struct mount *old, struct dentry *root, } /* Don't allow unprivileged users to reveal what is under a mount */ - if ((flag & CL_UNPRIVILEGED) && list_empty(&old->mnt_expire)) + if ((flag & CL_UNPRIVILEGED) && + (!(flag & CL_EXPIRE) || list_empty(&old->mnt_expire))) mnt->mnt.mnt_flags |= MNT_LOCKED; atomic_inc(&sb->s_active); |