diff options
| author | Jeff Layton | 2012-10-10 15:25:29 -0400 |
|---|---|---|
| committer | Al Viro | 2012-10-12 20:15:08 -0400 |
| commit | 873f1eedc1b983d772283279192c4ca2f60e8482 (patch) | |
| tree | dc5ff4dabb933c3392917602c0f6aeb00d25e6ea | |
| parent | 7ac86265dc8f665cc49d6e60a125e608cd2fca14 (diff) | |
vfs: turn do_path_lookup into wrapper around struct filename variant
...and make the user_path callers use that variant instead.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/namei.c | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/fs/namei.c b/fs/namei.c index 5dbc3f836934..8c14353fb750 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1988,20 +1988,30 @@ static int path_lookupat(int dfd, const char *name, return err; } -static int do_path_lookup(int dfd, const char *name, +static int filename_lookup(int dfd, struct filename *name, unsigned int flags, struct nameidata *nd) { - int retval = path_lookupat(dfd, name, flags | LOOKUP_RCU, nd); + int retval = path_lookupat(dfd, name->name, flags | LOOKUP_RCU, nd); if (unlikely(retval == -ECHILD)) - retval = path_lookupat(dfd, name, flags, nd); + retval = path_lookupat(dfd, name->name, flags, nd); if (unlikely(retval == -ESTALE)) - retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd); + retval = path_lookupat(dfd, name->name, + flags | LOOKUP_REVAL, nd); if (likely(!retval)) - audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT); + audit_inode(name->name, nd->path.dentry, + flags & LOOKUP_PARENT); return retval; } +static int do_path_lookup(int dfd, const char *name, + unsigned int flags, struct nameidata *nd) +{ + struct filename filename = { .name = name }; + + return filename_lookup(dfd, &filename, flags, nd); +} + /* does lookup, returns the object with parent locked */ struct dentry *kern_path_locked(const char *name, struct path *path) { @@ -2125,7 +2135,7 @@ int user_path_at_empty(int dfd, const char __user *name, unsigned flags, BUG_ON(flags & LOOKUP_PARENT); - err = do_path_lookup(dfd, tmp->name, flags, &nd); + err = filename_lookup(dfd, tmp, flags, &nd); putname(tmp); if (!err) *path = nd.path; @@ -2139,6 +2149,12 @@ int user_path_at(int dfd, const char __user *name, unsigned flags, return user_path_at_empty(dfd, name, flags, path, NULL); } +/* + * NB: most callers don't do anything directly with the reference to the + * to struct filename, but the nd->last pointer points into the name string + * allocated by getname. So we must hold the reference to it until all + * path-walking is complete. + */ static struct filename * user_path_parent(int dfd, const char __user *path, struct nameidata *nd) { @@ -2148,7 +2164,7 @@ user_path_parent(int dfd, const char __user *path, struct nameidata *nd) if (IS_ERR(s)) return s; - error = do_path_lookup(dfd, s->name, LOOKUP_PARENT, nd); + error = filename_lookup(dfd, s, LOOKUP_PARENT, nd); if (error) { putname(s); return ERR_PTR(error); |