From 9fe616e5f0d374a6ce9b21747b2b57c7aa7288e9 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 5 Feb 2010 01:41:33 -0500 Subject: [PATCH] --- yaml --- r: 185724 b: refs/heads/master c: 37afdc7960ab493f827b5df9dc1b71b63b44331c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/tomoyo/realpath.c | 23 ++++------------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/[refs] b/[refs] index c6160b3a6583..0b0e85196cd3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f5596af44514f99e3a654a4f7cb813354b9e516 +refs/heads/master: 37afdc7960ab493f827b5df9dc1b71b63b44331c diff --git a/trunk/security/tomoyo/realpath.c b/trunk/security/tomoyo/realpath.c index 18369d497eb8..6a4f8495f281 100644 --- a/trunk/security/tomoyo/realpath.c +++ b/trunk/security/tomoyo/realpath.c @@ -89,27 +89,12 @@ int tomoyo_realpath_from_path2(struct path *path, char *newname, sp = dentry->d_op->d_dname(dentry, newname + offset, newname_len - offset); } else { - /* Taken from d_namespace_path(). */ - struct path root; - struct path ns_root = { }; - struct path tmp; - - read_lock(¤t->fs->lock); - root = current->fs->root; - path_get(&root); - read_unlock(¤t->fs->lock); - spin_lock(&vfsmount_lock); - if (root.mnt && root.mnt->mnt_ns) - ns_root.mnt = mntget(root.mnt->mnt_ns->root); - if (ns_root.mnt) - ns_root.dentry = dget(ns_root.mnt->mnt_root); - spin_unlock(&vfsmount_lock); + struct path ns_root = {.mnt = NULL, .dentry = NULL}; + spin_lock(&dcache_lock); - tmp = ns_root; - sp = __d_path(path, &tmp, newname, newname_len); + /* go to whatever namespace root we are under */ + sp = __d_path(path, &ns_root, newname, newname_len); spin_unlock(&dcache_lock); - path_put(&root); - path_put(&ns_root); /* Prepend "/proc" prefix if using internal proc vfs mount. */ if (!IS_ERR(sp) && (path->mnt->mnt_parent == path->mnt) && (strcmp(path->mnt->mnt_sb->s_type->name, "proc") == 0)) {