Commit 44672e4f authored by Nick Piggin's avatar Nick Piggin Committed by Al Viro

apparmor: use task path helpers

apparmor: use task path helpers
Signed-off-by: default avatarNick Piggin <npiggin@kernel.dk>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent baa03890
...@@ -62,19 +62,14 @@ static int d_namespace_path(struct path *path, char *buf, int buflen, ...@@ -62,19 +62,14 @@ static int d_namespace_path(struct path *path, char *buf, int buflen,
int deleted, connected; int deleted, connected;
int error = 0; int error = 0;
/* Get the root we want to resolve too */ /* Get the root we want to resolve too, released below */
if (flags & PATH_CHROOT_REL) { if (flags & PATH_CHROOT_REL) {
/* resolve paths relative to chroot */ /* resolve paths relative to chroot */
read_lock(&current->fs->lock); get_fs_root(current->fs, &root);
root = current->fs->root;
/* released below */
path_get(&root);
read_unlock(&current->fs->lock);
} else { } else {
/* resolve paths relative to namespace */ /* resolve paths relative to namespace */
root.mnt = current->nsproxy->mnt_ns->root; root.mnt = current->nsproxy->mnt_ns->root;
root.dentry = root.mnt->mnt_root; root.dentry = root.mnt->mnt_root;
/* released below */
path_get(&root); path_get(&root);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment