Commit 0aa9e4f1 authored by Josh Triplett's avatar Josh Triplett Committed by Linus Torvalds

[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: default avatarJosh Triplett <josh@freedesktop.org>
Cc: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6ecbc4e1
...@@ -22,7 +22,7 @@ static int efs_symlink_readpage(struct file *file, struct page *page) ...@@ -22,7 +22,7 @@ static int efs_symlink_readpage(struct file *file, struct page *page)
err = -ENAMETOOLONG; err = -ENAMETOOLONG;
if (size > 2 * EFS_BLOCKSIZE) if (size > 2 * EFS_BLOCKSIZE)
goto fail; goto fail_notlocked;
lock_kernel(); lock_kernel();
/* read first 512 bytes of link target */ /* read first 512 bytes of link target */
...@@ -47,6 +47,7 @@ static int efs_symlink_readpage(struct file *file, struct page *page) ...@@ -47,6 +47,7 @@ static int efs_symlink_readpage(struct file *file, struct page *page)
return 0; return 0;
fail: fail:
unlock_kernel(); unlock_kernel();
fail_notlocked:
SetPageError(page); SetPageError(page);
kunmap(page); kunmap(page);
unlock_page(page); unlock_page(page);
......
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