[PATCH v7 29/49] vfs: add a reval argument to user_path_parent

...so we can tell it when to set LOOKUP_REVAL. Signed-off-by: Jeff Layton <jlayton(a)redhat.com&gt; --- fs/namei.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index e0ee4b9..b73315d 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2187,15 +2187,20 @@ int user_path_at(int dfd, const char __user *name, unsigned flags, * path-walking is complete. */ static struct getname_info * -user_path_parent(int dfd, const char __user *path, struct nameidata *nd) +user_path_parent(int dfd, const char __user *path, struct nameidata *nd, + unsigned int reval) { struct getname_info *s = getname(path); int error; + unsigned int flags = LOOKUP_PARENT; + + if (reval) + flags |= LOOKUP_REVAL; if (IS_ERR(s)) return s; - error = ginfo_lookup(dfd, s, LOOKUP_PARENT, nd); + error = ginfo_lookup(dfd, s, flags, nd); if (error) { putname(s); return ERR_PTR(error); @@ -3343,7 +3348,7 @@ static long do_rmdir(int dfd, const char __user *pathname) struct dentry *dentry; struct nameidata nd; - name = user_path_parent(dfd, pathname, &nd); + name = user_path_parent(dfd, pathname, &nd, 0); if (IS_ERR(name)) return PTR_ERR(name); @@ -3439,7 +3444,7 @@ static long do_unlinkat(int dfd, const char __user *pathname) struct nameidata nd; struct inode *inode = NULL; - name = user_path_parent(dfd, pathname, &nd); + name = user_path_parent(dfd, pathname, &nd, 0); if (IS_ERR(name)) return PTR_ERR(name); @@ -3834,13 +3839,13 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname, struct getname_info *to; int error; - from = user_path_parent(olddfd, oldname, &oldnd); + from = user_path_parent(olddfd, oldname, &oldnd, 0); if (IS_ERR(from)) { error = PTR_ERR(from); goto exit; } - to = user_path_parent(newdfd, newname, &newnd); + to = user_path_parent(newdfd, newname, &newnd, 0); if (IS_ERR(to)) { error = PTR_ERR(to); goto exit1; -- 1.7.11.4