[PATCH] [efs] Remove incorrect unlock_kernel from failure path inefs_symlink_readpage

From: Josh Triplett
Date: Mon Jul 24 2006 - 17:54:31 EST


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@xxxxxxxxxxxxxxx>
---
This bug exists in the 2.4 kernel series as far back as 2.4.0, and this
patch should apply there as well.

fs/efs/symlink.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/efs/symlink.c b/fs/efs/symlink.c
index e249cf7..1d30d2f 100644
--- a/fs/efs/symlink.c
+++ b/fs/efs/symlink.c
@@ -22,7 +22,7 @@ static int efs_symlink_readpage(struct f

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 f
return 0;
fail:
unlock_kernel();
+fail_notlocked:
SetPageError(page);
kunmap(page);
unlock_page(page);


-
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/