OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

namei: may_follow_link() - lift terminate_walk() on failures into caller 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-05-08 16:38:31 -04:00
parent ab10492345
commit b5cd339762
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/namei.c
View File

@ -798,7 +798,6 @@ static inline int may_follow_link(struct nameidata *nd)
return 0; return 0;
audit_log_link_denied("follow_link", &nd->stack[0].link); audit_log_link_denied("follow_link", &nd->stack[0].link);
terminate_walk(nd);
return -EACCES; return -EACCES;
} }
@ -1980,8 +1979,10 @@ static int trailing_symlink(struct nameidata *nd)
{ {
const char *s; const char *s;
int error = may_follow_link(nd); int error = may_follow_link(nd);
if (unlikely(error)) if (unlikely(error)) {
terminate_walk(nd);
return error; return error;
}
nd->flags |= LOOKUP_PARENT; nd->flags |= LOOKUP_PARENT;
nd->stack[0].name = NULL; nd->stack[0].name = NULL;
s = get_link(nd); s = get_link(nd);