diff options
author | Nick Piggin <npiggin@kernel.dk> | 2010-08-17 14:37:32 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-08-18 08:35:46 -0400 |
commit | 44672e4fbd40e2dda8bbce7d0f71d24dbfc7e00e (patch) | |
tree | 7d6251adb6eac69a0d0ba97e64dbf2c41c67928e | |
parent | baa0389073eb7beb9d36f6d13df97e16c1bfa626 (diff) |
apparmor: use task path helpers
apparmor: use task path helpers
Signed-off-by: Nick Piggin <npiggin@kernel.dk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | security/apparmor/path.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/security/apparmor/path.c b/security/apparmor/path.c index 96bab9469d48..19358dc14605 100644 --- a/security/apparmor/path.c +++ b/security/apparmor/path.c | |||
@@ -62,19 +62,14 @@ static int d_namespace_path(struct path *path, char *buf, int buflen, | |||
62 | int deleted, connected; | 62 | int deleted, connected; |
63 | int error = 0; | 63 | int error = 0; |
64 | 64 | ||
65 | /* Get the root we want to resolve too */ | 65 | /* Get the root we want to resolve too, released below */ |
66 | if (flags & PATH_CHROOT_REL) { | 66 | if (flags & PATH_CHROOT_REL) { |
67 | /* resolve paths relative to chroot */ | 67 | /* resolve paths relative to chroot */ |
68 | read_lock(¤t->fs->lock); | 68 | get_fs_root(current->fs, &root); |
69 | root = current->fs->root; | ||
70 | /* released below */ | ||
71 | path_get(&root); | ||
72 | read_unlock(¤t->fs->lock); | ||
73 | } else { | 69 | } else { |
74 | /* resolve paths relative to namespace */ | 70 | /* resolve paths relative to namespace */ |
75 | root.mnt = current->nsproxy->mnt_ns->root; | 71 | root.mnt = current->nsproxy->mnt_ns->root; |
76 | root.dentry = root.mnt->mnt_root; | 72 | root.dentry = root.mnt->mnt_root; |
77 | /* released below */ | ||
78 | path_get(&root); | 73 | path_get(&root); |
79 | } | 74 | } |
80 | 75 | ||