diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-01-07 15:28:26 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2015-04-09 12:38:31 -0400 |
commit | cd4a40174b71acd021877341684d8bb1dc8ea4ae (patch) | |
tree | 58a7f55022d02103e77f5a8005134c863bd24b4e /fs | |
parent | 0c56fe31420ca599c90240315f7959bf1b4eb6ce (diff) |
mnt: Fail collect_mounts when applied to unmounted mounts
The only users of collect_mounts are in audit_tree.c
In audit_trim_trees and audit_add_tree_rule the path passed into
collect_mounts is generated from kern_path passed an audit_tree
pathname which is guaranteed to be an absolute path. In those cases
collect_mounts is obviously intended to work on mounted paths and
if a race results in paths that are unmounted when collect_mounts
it is reasonable to fail early.
The paths passed into audit_tag_tree don't have the absolute path
check. But are used to play with fsnotify and otherwise interact with
the audit_trees, so again operating only on mounted paths appears
reasonable.
Avoid having to worry about what happens when we try and audit
unmounted filesystems by restricting collect_mounts to mounts
that appear in the mount tree.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/namespace.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 2b12b7a9455d..acc5583764dc 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -1669,8 +1669,11 @@ struct vfsmount *collect_mounts(struct path *path) | |||
1669 | { | 1669 | { |
1670 | struct mount *tree; | 1670 | struct mount *tree; |
1671 | namespace_lock(); | 1671 | namespace_lock(); |
1672 | tree = copy_tree(real_mount(path->mnt), path->dentry, | 1672 | if (!check_mnt(real_mount(path->mnt))) |
1673 | CL_COPY_ALL | CL_PRIVATE); | 1673 | tree = ERR_PTR(-EINVAL); |
1674 | else | ||
1675 | tree = copy_tree(real_mount(path->mnt), path->dentry, | ||
1676 | CL_COPY_ALL | CL_PRIVATE); | ||
1674 | namespace_unlock(); | 1677 | namespace_unlock(); |
1675 | if (IS_ERR(tree)) | 1678 | if (IS_ERR(tree)) |
1676 | return ERR_CAST(tree); | 1679 | return ERR_CAST(tree); |