From 7c0f5ce10d8f46da2a4ac456a4849c6551b2e1e2 Mon Sep 17 00:00:00 2001 From: Nick Piggin Date: Wed, 18 Aug 2010 04:37:32 +1000 Subject: [PATCH] --- yaml --- r: 209635 b: refs/heads/master c: 44672e4fbd40e2dda8bbce7d0f71d24dbfc7e00e h: refs/heads/master i: 209633: 863a362490ecb05d99be700662aaea8a97c1dcf6 209631: 0f17e6f0e9b5510c86ba6f32a57b444a69807c80 v: v3 --- [refs] | 2 +- trunk/security/apparmor/path.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 54a772b7927d..901094fb900a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: baa0389073eb7beb9d36f6d13df97e16c1bfa626 +refs/heads/master: 44672e4fbd40e2dda8bbce7d0f71d24dbfc7e00e diff --git a/trunk/security/apparmor/path.c b/trunk/security/apparmor/path.c index 96bab9469d48..19358dc14605 100644 --- a/trunk/security/apparmor/path.c +++ b/trunk/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); }