leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

link_path_walk: final preparations to killing recursion

Browse Source 
reduce the number of returns in there - turn all places
where it returns zero into goto OK and places where it
returns non-zero into goto Err.  The only non-trivial
detail is that all breaks in the loop are guaranteed
to be with non-zero err.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-04-18 20:21:40 -04:00
parent bb8603f8e1
commit bdf6cbf179
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/namei.c
View File

@ -1716,7 +1716,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
while (*name=='/') while (*name=='/')
name++; name++;
if (!*name) if (!*name)
return 0; goto OK;
/* At this point we know we have a real path component. */ /* At this point we know we have a real path component. */
for(;;) { for(;;) {
@ -1759,7 +1759,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
name += hashlen_len(hash_len); name += hashlen_len(hash_len);
if (!*name) if (!*name)
return 0; goto OK;
/* /*
* If it wasn't NUL, we know it was '/'. Skip that * If it wasn't NUL, we know it was '/'. Skip that
* slash, and continue until no more slashes. * slash, and continue until no more slashes.
@ -1768,12 +1768,12 @@ static int link_path_walk(const char *name, struct nameidata *nd)
name++; name++;
} while (unlikely(*name == '/')); } while (unlikely(*name == '/'));
if (!*name) if (!*name)
return 0; goto OK;
err = walk_component(nd, LOOKUP_FOLLOW); err = walk_component(nd, LOOKUP_FOLLOW);
Walked: Walked:
if (err < 0) if (err < 0)
return err; goto Err;
if (err) { if (err) {
struct path link; struct path link;
@ -1783,7 +1783,8 @@ Walked:
if (unlikely(current->link_count >= MAX_NESTED_LINKS)) { if (unlikely(current->link_count >= MAX_NESTED_LINKS)) {
path_put_conditional(&nd->link, nd); path_put_conditional(&nd->link, nd);
path_put(&nd->path); path_put(&nd->path);
return -ELOOP; err = -ELOOP;
goto Err;
} }
BUG_ON(nd->depth >= MAX_NESTED_LINKS); BUG_ON(nd->depth >= MAX_NESTED_LINKS);
@ -1797,7 +1798,7 @@ Walked:
err = PTR_ERR(s); err = PTR_ERR(s);
current->link_count--; current->link_count--;
nd->depth--; nd->depth--;
return err; goto Err;
} }
err = 0; err = 0;
if (unlikely(!s)) { if (unlikely(!s)) {
@ -1820,7 +1821,7 @@ Walked:
put_link(nd, &link, cookie); put_link(nd, &link, cookie);
current->link_count--; current->link_count--;
nd->depth--; nd->depth--;
return err; goto Err;
} else { } else {
err = walk_component(nd, LOOKUP_FOLLOW); err = walk_component(nd, LOOKUP_FOLLOW);
put_link(nd, &link, cookie); put_link(nd, &link, cookie);
@ -1836,7 +1837,10 @@ Walked:
} }
} }
terminate_walk(nd); terminate_walk(nd);
Err:
return err; return err;
OK:
return 0;
} }
static int path_init(int dfd, const struct filename *name, unsigned int flags, static int path_init(int dfd, const struct filename *name, unsigned int flags,