]> err.no Git - linux-2.6/commitdiff
[PATCH] efs: Remove incorrect unlock_kernel from failure path in efs_symlink_readpage()
authorJosh Triplett <josht@us.ibm.com>
Sun, 30 Jul 2006 10:03:58 +0000 (03:03 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 31 Jul 2006 20:28:41 +0000 (13:28 -0700)
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>
fs/efs/symlink.c

index e249cf733a6bdb9b728b664a9910dff59edb8101..1d30d2ff440fa3fecb7448b25416dd8a2c13abfa 100644 (file)
@@ -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);