[PATCH v3 081/110] namei: move bumping the refcount of link->mnt into pick_link()

[Al Viro]

From: Al Viro <viro@xxxxxxxxxxxxxxxxxx>

update the failure cleanup in may_follow_link() to match that.

Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
---
 fs/namei.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 55283fe..05efcc0 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -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;
 	}
 
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/