Skip to contentSkip to conversation

vfs: don't hold s_umount over close_bdev_exclusive() call

PATCH New [email protected] 1 participant 1 message Jul 20, 2010 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vfs: don't hold s_umount over close_bdev_exclusive() call

From: Tejun Heo <[email protected]>

Fix an obscure AB-BA deadlock in get_sb_bdev().

When a superblock is mounted more than once get_sb_bdev() calls close_bdev_exclusive() to drop the extra bdev reference while holding s_umount. However, sb->s_umount nests inside bd_mutex during __invalidate_device() and close_bdev_exclusive() acquires bd_mutex during blkdev_put(); thus creating an AB-BA deadlock.

This condition doesn't trigger frequently. For this condition to be visible to lockdep, the filesystem must occupy the whole device (as __invalidate_device() only grabs bd_mutex for the whole device), the FS must be mounted more than once and partition rescan should be issued while the FS is still mounted.

Fix it by dropping s_umount over close_bdev_exclusive().

---

 fs/super.c |    9 +++++++++
 1 file changed, 9 insertions(+)
fs/super.c renamed from fs/super.c~vfs-dont-hold-s_umount-over-close_bdev_exclusive-call +9 -0
diff -puN fs/super.c~vfs-dont-hold-s_umount-over-close_bdev_exclusive-call fs/super.c
@@ -773,7 +773,16 @@ int get_sb_bdev(struct file_system_type 
 			goto error_bdev;
 		}
 
+		/*
+		 * s_umount nests inside bd_mutex during
+		 * __invalidate_device().  close_bdev_exclusive()
+		 * acquires bd_mutex and can't be called under
+		 * s_umount.  Drop s_umount temporarily.  This is safe
+		 * as we're holding an active reference.
+		 */
+		up_write(&s->s_umount);
 		close_bdev_exclusive(bdev, mode);
+		down_write(&s->s_umount);
 	} else {
 		char b[BDEVNAME_SIZE];
 

_