Commit 0aa9e4f1 authored Jul 30, 2006 by Josh Triplett Committed by Linus Torvalds Jul 31, 2006

[PATCH] efs: Remove incorrect unlock_kernel from failure path in efs_symlink_readpage()



If efs_symlink_readpage hits the -ENAMETOOLONG error path, it will call
unlock_kernel without ever having called lock_kernel(); fix this by
creating and jumping to a new label fail_notlocked rather than the fail
label used after calling lock_kernel().

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Cc: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 6ecbc4e1

fs/efs/symlink.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ static int efs_symlink_readpage(struct file file, struct page page)

		err = -ENAMETOOLONG;
		if (size > 2 * EFS_BLOCKSIZE)
		goto fail;
		goto fail_notlocked;

		lock_kernel();
		/* read first 512 bytes of link target */
		@@ -47,6 +47,7 @@ static int efs_symlink_readpage(struct file file, struct page page)
		return 0;
		fail:
		unlock_kernel();
		fail_notlocked:
		SetPageError(page);
		kunmap(page);
		unlock_page(page);