Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fb1e308 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] jffs2: fix symlink error handling 



The current calling conventions for ->follow_link() are already fairly
complex.

What we have is
	1) you can return -error; then you must release nameidata yourself
	   and ->put_link() will _not_ be called.
	2) you can do nd_set_link(nd, ERR_PTR(-error)) and return 0
	3) you can do nd_set_link(nd, path) and return 0
	4) you can return 0 (after having moved nameidata yourself)

jffs2 follow_link() is broken - it has an exit where it returns
-EIO and leaks nameidata.

Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 91aa9fb5

fs/jffs2/symlink.c

+6 −4
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ struct inode_operations jffs2_symlink_inode_operations = 
static int jffs2_follow_link(struct dentry *dentry, struct nameidata *nd)

{

	struct jffs2_inode_info *f = JFFS2_INODE_INFO(dentry->d_inode);

	char *p = (char *)f->dents;

	

	/*

	 * We don't acquire the f->sem mutex here since the only data we
@@ -45,13 +46,14 @@ static int jffs2_follow_link(struct dentry *dentry, struct nameidata *nd) 
	 * nd_set_link() call.

	 */

	

	if (!f->dents) {

	if (!p) {

		printk(KERN_ERR "jffs2_follow_link(): can't find symlink taerget\n");

		return -EIO;

	}

		p = ERR_PTR(-EIO);

	} else {

		D1(printk(KERN_DEBUG "jffs2_follow_link(): target path is '%s'\n", (char *) f->dents));

	}



	nd_set_link(nd, (char *)f->dents);

	nd_set_link(nd, p);

	

	/*

	 * We unlock the f->sem mutex but VFS will use the f->dents string. This is safe