Skip to content

Commit

Permalink
vfs: add a flags argument to user_path_parent
Browse files Browse the repository at this point in the history
...so we can pass in LOOKUP_REVAL. For now, nothing does yet.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Jeff Layton authored and Al Viro committed Dec 20, 2012
1 parent 442e31c commit 9e790bd
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -2175,15 +2175,19 @@ int user_path_at(int dfd, const char __user *name, unsigned flags,
* path-walking is complete.
*/
static struct filename *
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 flags)
{
struct filename *s = getname(path);
int error;

/* only LOOKUP_REVAL is allowed in extra flags */
flags &= LOOKUP_REVAL;

if (IS_ERR(s))
return s;

error = filename_lookup(dfd, s, LOOKUP_PARENT, nd);
error = filename_lookup(dfd, s, flags | LOOKUP_PARENT, nd);
if (error) {
putname(s);
return ERR_PTR(error);
Expand Down Expand Up @@ -3336,7 +3340,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);

Expand Down Expand Up @@ -3432,7 +3436,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);

Expand Down Expand Up @@ -3827,13 +3831,13 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
struct filename *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;
Expand Down

0 comments on commit 9e790bd

Please sign in to comment.