aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2015-01-07 14:28:26 -0600
committerZiyan <jaraidaniel@gmail.com>2016-10-29 01:34:15 +0200
commitab77d295c65c87996ecf32ccbb4425139ca5652e (patch)
treeab09118ab90257bb56f11c2d7581af9876bccb6b /fs
parent418c398e20bddb649fe1e844ddea4c781753f70a (diff)
downloadkernel_samsung_tuna-ab77d295c65c87996ecf32ccbb4425139ca5652e.zip
kernel_samsung_tuna-ab77d295c65c87996ecf32ccbb4425139ca5652e.tar.gz
kernel_samsung_tuna-ab77d295c65c87996ecf32ccbb4425139ca5652e.tar.bz2
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. Change-Id: I2edfee6d6951a2179ce8f53785b65ddb1eb95629 Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/namespace.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index 2414feb..8815c8b 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1507,7 +1507,11 @@ struct vfsmount *collect_mounts(struct path *path)
{
struct vfsmount *tree;
down_write(&namespace_sem);
- tree = copy_tree(path->mnt, path->dentry, CL_COPY_ALL | CL_PRIVATE);
+ if (!check_mnt(path->mnt))
+ tree = ERR_PTR(-EINVAL);
+ else
+ tree = copy_tree(path->mnt, path->dentry,
+ CL_COPY_ALL | CL_PRIVATE);
up_write(&namespace_sem);
if (IS_ERR(tree))
return NULL;