diff options
| author | Nick Piggin <npiggin@kernel.dk> | 2010-08-18 04:37:32 +1000 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-08-18 08:35:46 -0400 |
| commit | 44672e4fbd40e2dda8bbce7d0f71d24dbfc7e00e (patch) | |
| tree | 7d6251adb6eac69a0d0ba97e64dbf2c41c67928e /security | |
| parent | baa0389073eb7beb9d36f6d13df97e16c1bfa626 (diff) | |
| download | linux-3.10-44672e4fbd40e2dda8bbce7d0f71d24dbfc7e00e.tar.gz linux-3.10-44672e4fbd40e2dda8bbce7d0f71d24dbfc7e00e.tar.bz2 linux-3.10-44672e4fbd40e2dda8bbce7d0f71d24dbfc7e00e.zip | |
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>
Diffstat (limited to 'security')
| -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 96bab9469d4..19358dc1460 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, int deleted, connected; 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) { /* resolve paths relative to chroot */ - read_lock(¤t->fs->lock); - root = current->fs->root; - /* released below */ - path_get(&root); - read_unlock(¤t->fs->lock); + get_fs_root(current->fs, &root); } else { /* resolve paths relative to namespace */ root.mnt = current->nsproxy->mnt_ns->root; root.dentry = root.mnt->mnt_root; - /* released below */ path_get(&root); } |