Commit cd179f44 authored by Al Viro's avatar Al Viro

namei: move bumping the refcount of link->mnt into pick_link()

update the failure cleanup in may_follow_link() to match that.
Signed-off-by: default avatarAl Viro <[email protected]>
parent e8bb73df
......@@ -802,7 +802,7 @@ static inline int may_follow_link(struct path *link, struct nameidata *nd)
return 0;
audit_log_link_denied("follow_link", link);
path_put_conditional(link, nd);
path_put(link);
path_put(&nd->path);
return -EACCES;
}
......@@ -887,9 +887,6 @@ const char *get_link(struct nameidata *nd)
BUG_ON(nd->flags & LOOKUP_RCU);
if (nd->link.mnt == nd->path.mnt)
mntget(nd->link.mnt);
last->link = nd->link;
last->cookie = NULL;
nd->depth++;
......@@ -1574,9 +1571,11 @@ static int pick_link(struct nameidata *nd, struct path *link)
return -ECHILD;
}
}
if (link->mnt == nd->path.mnt)
mntget(link->mnt);
error = nd_alloc_stack(nd);
if (unlikely(error)) {
path_to_nameidata(link, nd);
path_put(link);
return error;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment