iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

namei: have link_path_walk() maintain LOOKUP_PARENT

Browse Source 
set on entry, clear when we get to the last component.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2020-03-05 15:48:44 -05:00
parent d8d4611a4f
commit c108837e06
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/namei.c
View File

@ -2124,6 +2124,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
int err; int err;
nd->last_type = LAST_ROOT; nd->last_type = LAST_ROOT;
nd->flags |= LOOKUP_PARENT;
if (IS_ERR(name)) if (IS_ERR(name))
return PTR_ERR(name); return PTR_ERR(name);
while (*name=='/') while (*name=='/')
@ -2184,8 +2185,10 @@ static int link_path_walk(const char *name, struct nameidata *nd)
if (unlikely(!*name)) { if (unlikely(!*name)) {
OK: OK:
/* pathname or trailing symlink, done */ /* pathname or trailing symlink, done */
if (!depth) if (!depth) {
nd->flags &= ~LOOKUP_PARENT;
return 0; return 0;
}
/* last component of nested symlink */ /* last component of nested symlink */
name = nd->stack[--depth].name; name = nd->stack[--depth].name;
link = walk_component(nd, 0); link = walk_component(nd, 0);
@ -2222,7 +2225,7 @@ static const char *path_init(struct nameidata *nd, unsigned flags)
if (flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
rcu_read_lock(); rcu_read_lock();
nd->flags = flags | LOOKUP_JUMPED | LOOKUP_PARENT; nd->flags = flags | LOOKUP_JUMPED;
nd->depth = 0; nd->depth = 0;
nd->m_seq = __read_seqcount_begin(&mount_lock.seqcount); nd->m_seq = __read_seqcount_begin(&mount_lock.seqcount);
@ -2314,16 +2317,10 @@ static const char *path_init(struct nameidata *nd, unsigned flags)
static inline const char *lookup_last(struct nameidata *nd) static inline const char *lookup_last(struct nameidata *nd)
{ {
const char *link;
if (nd->last_type == LAST_NORM && nd->last.name[nd->last.len]) if (nd->last_type == LAST_NORM && nd->last.name[nd->last.len])
nd->flags |= LOOKUP_FOLLOW | LOOKUP_DIRECTORY; nd->flags |= LOOKUP_FOLLOW | LOOKUP_DIRECTORY;
nd->flags &= ~LOOKUP_PARENT; return walk_component(nd, WALK_TRAILING);
link = walk_component(nd, WALK_TRAILING);
if (link) {
nd->flags |= LOOKUP_PARENT;
}
return link;
} }
static int handle_lookup_down(struct nameidata *nd) static int handle_lookup_down(struct nameidata *nd)
@ -3174,7 +3171,6 @@ static const char *do_last(struct nameidata *nd,
const char *res; const char *res;
int error; int error;
nd->flags &= ~LOOKUP_PARENT;
nd->flags |= op->intent; nd->flags |= op->intent;
if (nd->last_type != LAST_NORM) { if (nd->last_type != LAST_NORM) {
@ -3275,7 +3271,6 @@ finish_lookup:
put_link(nd); put_link(nd);
res = step_into(nd, WALK_TRAILING, dentry, inode, seq); res = step_into(nd, WALK_TRAILING, dentry, inode, seq);
if (unlikely(res)) { if (unlikely(res)) {
nd->flags |= LOOKUP_PARENT;
nd->flags &= ~(LOOKUP_OPEN|LOOKUP_CREATE|LOOKUP_EXCL); nd->flags &= ~(LOOKUP_OPEN|LOOKUP_CREATE|LOOKUP_EXCL);
return res; return res;
} }