Skip to content

Commit

Permalink
take RCU-dependent stuff around exec_permission() into a new helper
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Mar 14, 2011
1 parent c9c6cac commit 52094c8
Showing 1 changed file with 14 additions and 11 deletions.
25 changes: 14 additions & 11 deletions fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -1322,6 +1322,18 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
return PTR_ERR(dentry);
}

static inline int may_lookup(struct nameidata *nd)
{
if (nd->flags & LOOKUP_RCU) {
int err = exec_permission(nd->inode, IPERM_FLAG_RCU);
if (err != -ECHILD)
return err;
if (nameidata_drop_rcu(nd))
return -ECHILD;
}
return exec_permission(nd->inode, 0);
}

/*
* Name resolution.
* This is the basic name resolution function, turning a pathname into
Expand Down Expand Up @@ -1352,17 +1364,8 @@ static int link_path_walk(const char *name, struct nameidata *nd)
unsigned int c;

nd->flags |= LOOKUP_CONTINUE;
if (nd->flags & LOOKUP_RCU) {
err = exec_permission(nd->inode, IPERM_FLAG_RCU);
if (err == -ECHILD) {
if (nameidata_drop_rcu(nd))
return -ECHILD;
goto exec_again;
}
} else {
exec_again:
err = exec_permission(nd->inode, 0);
}

err = may_lookup(nd);
if (err)
break;

Expand Down

0 comments on commit 52094c8

Please sign in to comment.