diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-01-07 14:28:26 -0600 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-05-26 16:26:55 +0200 |
| commit | 6ab282fe6d43027b3b1ef820b3798aae8fdb432b (patch) | |
| tree | af88861bec1d312657979f7c5c91f11cdb521c46 /fs | |
| parent | 0b8b97704fbe442b3bba7a2c7eba9113122abafd (diff) | |
mnt: Fail collect_mounts when applied to unmounted mounts
commit cd4a40174b71acd021877341684d8bb1dc8ea4ae upstream.
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
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 247f34d43dda..185cd1aefa14 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1467,8 +1467,11 @@ struct vfsmount *collect_mounts(struct path *path) { struct mount *tree; namespace_lock(); - tree = copy_tree(real_mount(path->mnt), path->dentry, - CL_COPY_ALL | CL_PRIVATE); + if (!check_mnt(real_mount(path->mnt))) + tree = ERR_PTR(-EINVAL); + else + tree = copy_tree(real_mount(path->mnt), path->dentry, + CL_COPY_ALL | CL_PRIVATE); namespace_unlock(); if (IS_ERR(tree)) return ERR_CAST(tree); |