diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2009-04-02 21:17:03 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-05-09 10:49:42 -0400 |
commit | e24977d45f45d1675e050dc1a0aaf4bfc4ca9866 (patch) | |
tree | ee39b590596e9ca6cd18b8ece11a1f6d24278c29 /security/tomoyo/realpath.c | |
parent | 6b3304b531704711286c3359b06922b83fdba015 (diff) |
Reduce path_lookup() abuses
... use kern_path() where possible
[folded a fix from rdd]
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security/tomoyo/realpath.c')
-rw-r--r-- | security/tomoyo/realpath.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/security/tomoyo/realpath.c b/security/tomoyo/realpath.c index bf8e2b451687..40927a84cb6e 100644 --- a/security/tomoyo/realpath.c +++ b/security/tomoyo/realpath.c | |||
@@ -165,11 +165,11 @@ char *tomoyo_realpath_from_path(struct path *path) | |||
165 | */ | 165 | */ |
166 | char *tomoyo_realpath(const char *pathname) | 166 | char *tomoyo_realpath(const char *pathname) |
167 | { | 167 | { |
168 | struct nameidata nd; | 168 | struct path path; |
169 | 169 | ||
170 | if (pathname && path_lookup(pathname, LOOKUP_FOLLOW, &nd) == 0) { | 170 | if (pathname && kern_path(pathname, LOOKUP_FOLLOW, &path) == 0) { |
171 | char *buf = tomoyo_realpath_from_path(&nd.path); | 171 | char *buf = tomoyo_realpath_from_path(&path); |
172 | path_put(&nd.path); | 172 | path_put(&path); |
173 | return buf; | 173 | return buf; |
174 | } | 174 | } |
175 | return NULL; | 175 | return NULL; |
@@ -184,11 +184,11 @@ char *tomoyo_realpath(const char *pathname) | |||
184 | */ | 184 | */ |
185 | char *tomoyo_realpath_nofollow(const char *pathname) | 185 | char *tomoyo_realpath_nofollow(const char *pathname) |
186 | { | 186 | { |
187 | struct nameidata nd; | 187 | struct path path; |
188 | 188 | ||
189 | if (pathname && path_lookup(pathname, 0, &nd) == 0) { | 189 | if (pathname && kern_path(pathname, 0, &path) == 0) { |
190 | char *buf = tomoyo_realpath_from_path(&nd.path); | 190 | char *buf = tomoyo_realpath_from_path(&path); |
191 | path_put(&nd.path); | 191 | path_put(&path); |
192 | return buf; | 192 | return buf; |
193 | } | 193 | } |
194 | return NULL; | 194 | return NULL; |