Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-06 05:13:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

namei: move link count check and stack allocation into pick_link()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-05-04 18:26:59 -04:00
parent d63ff28f0f
commit 626de99676
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fs/namei.c
View File

@ -891,16 +891,10 @@ const char *get_link(struct nameidata *nd)
if (nd->link.mnt == nd->path.mnt) if (nd->link.mnt == nd->path.mnt)
mntget(nd->link.mnt); mntget(nd->link.mnt);
if (unlikely(current->total_link_count >= MAXSYMLINKS)) {
path_put(&nd->link);
return ERR_PTR(-ELOOP);
}
last->link = nd->link; last->link = nd->link;
last->cookie = NULL; last->cookie = NULL;
cond_resched(); cond_resched();
current->total_link_count++;
touch_atime(&last->link); touch_atime(&last->link);
@ -1568,12 +1562,23 @@ static void terminate_walk(struct nameidata *nd)
static int pick_link(struct nameidata *nd, struct path *link) static int pick_link(struct nameidata *nd, struct path *link)
{ {
int error;
if (unlikely(current->total_link_count++ >= MAXSYMLINKS)) {
path_to_nameidata(link, nd);
return -ELOOP;
}
if (nd->flags & LOOKUP_RCU) { if (nd->flags & LOOKUP_RCU) {
if (unlikely(nd->path.mnt != link->mnt || if (unlikely(nd->path.mnt != link->mnt ||
unlazy_walk(nd, link->dentry))) { unlazy_walk(nd, link->dentry))) {
return -ECHILD; return -ECHILD;
} }
} }
error = nd_alloc_stack(nd);
if (unlikely(error)) {
path_to_nameidata(link, nd);
return error;
}
nd->link = *link; nd->link = *link;
return 1; return 1;
} }
@ -1840,15 +1845,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
break; break;
if (err) { if (err) {
const char *s; const char *s = get_link(nd);
err = nd_alloc_stack(nd);
if (unlikely(err)) {
path_to_nameidata(&nd->link, nd);
break;
}
s = get_link(nd);
if (unlikely(IS_ERR(s))) { if (unlikely(IS_ERR(s))) {
err = PTR_ERR(s); err = PTR_ERR(s);