diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/apparmor/path.c | 2 | ||||
-rw-r--r-- | security/tomoyo/realpath.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/security/apparmor/path.c b/security/apparmor/path.c index 82396050f186..36cc0cc39e78 100644 --- a/security/apparmor/path.c +++ b/security/apparmor/path.c | |||
@@ -72,10 +72,8 @@ static int d_namespace_path(struct path *path, char *buf, int buflen, | |||
72 | path_get(&root); | 72 | path_get(&root); |
73 | } | 73 | } |
74 | 74 | ||
75 | spin_lock(&dcache_lock); | ||
76 | tmp = root; | 75 | tmp = root; |
77 | res = __d_path(path, &tmp, buf, buflen); | 76 | res = __d_path(path, &tmp, buf, buflen); |
78 | spin_unlock(&dcache_lock); | ||
79 | 77 | ||
80 | *name = res; | 78 | *name = res; |
81 | /* handle error conditions - and still allow a partial path to | 79 | /* handle error conditions - and still allow a partial path to |
diff --git a/security/tomoyo/realpath.c b/security/tomoyo/realpath.c index ed8ccd680102..1d0bf8fa1922 100644 --- a/security/tomoyo/realpath.c +++ b/security/tomoyo/realpath.c | |||
@@ -127,10 +127,8 @@ char *tomoyo_realpath_from_path(struct path *path) | |||
127 | /* If we don't have a vfsmount, we can't calculate. */ | 127 | /* If we don't have a vfsmount, we can't calculate. */ |
128 | if (!path->mnt) | 128 | if (!path->mnt) |
129 | break; | 129 | break; |
130 | spin_lock(&dcache_lock); | ||
131 | /* go to whatever namespace root we are under */ | 130 | /* go to whatever namespace root we are under */ |
132 | pos = __d_path(path, &ns_root, buf, buf_len); | 131 | pos = __d_path(path, &ns_root, buf, buf_len); |
133 | spin_unlock(&dcache_lock); | ||
134 | /* Prepend "/proc" prefix if using internal proc vfs mount. */ | 132 | /* Prepend "/proc" prefix if using internal proc vfs mount. */ |
135 | if (!IS_ERR(pos) && (path->mnt->mnt_flags & MNT_INTERNAL) && | 133 | if (!IS_ERR(pos) && (path->mnt->mnt_flags & MNT_INTERNAL) && |
136 | (path->mnt->mnt_sb->s_magic == PROC_SUPER_MAGIC)) { | 134 | (path->mnt->mnt_sb->s_magic == PROC_SUPER_MAGIC)) { |