The patch titled
efs: Remove incorrect unlock_kernel from failure path in efs_symlink_readpage()
has been removed from the -mm tree. Its filename is
remove-incorrect-unlock_kernel-from-failure-path-in.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: efs: Remove incorrect unlock_kernel from failure path in efs_symlink_readpage()
From: Josh Triplett <josht@xxxxxxxxxx>
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>
Cc: Marcelo Tosatti <marcelo.tosatti@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/efs/symlink.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN fs/efs/symlink.c~remove-incorrect-unlock_kernel-from-failure-path-in fs/efs/symlink.c
--- a/fs/efs/symlink.c~remove-incorrect-unlock_kernel-from-failure-path-in
+++ a/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);
_
Patches currently in -mm which might be from josht@xxxxxxxxxx are
origin.patch
git-nfs.patch
xfs-add-lock-annotations-to-xfs_trans_update_ail-and-xfs_trans_delete_ail.patch
efi-add-lock-annotations-for-efi_call_phys_prelog-and-efi_call_phys_epilog.patch
mbcache-add-lock-annotation-for-__mb_cache_entry_release_unlock.patch
afs-add-lock-annotations-to-afs_proc_cell_servers_startstop.patch
fuse-add-lock-annotations-to-request_end-and-fuse_read_interrupt.patch
hugetlbfs-add-lock-annotation-to-hugetlbfs_forget_inode.patch
jbd-add-lock-annotation-to-jbd_sync_bh.patch
fs-add-lock-annotation-to-grab_super.patch
rcu-add-lock-annotations-to-rcu_bh_torture_read_lockunlock.patch
timer-add-lock-annotation-to-lock_timer_base.patch
nfsd-add-lock-annotations-to-e_start-and-e_stop.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
