Skip to contentSkip to conversation

Btrfs: Fix a crash when mounting a subvolume

PATCH In review Li Zefan 2 participants 3 messages Dec 7, 2010 Btrfs file system

lore
Share & tools
lore

Li Zefan

author
#0 lore raw

PATCH 1/1 Btrfs: Fix a crash when mounting a subvolume

We should drop dentry before deactivating the superblock, otherwise we can hit this bug:

BUG: Dentry f349a690{i=100,n=/} still in use (1) [unmount of btrfs loop1]

...

Steps to reproduce the bug:

  # mount /dev/loop1 /mnt
  # mkdir save
  # btrfs subvolume snapshot /mnt save/snap1
  # umount /mnt
  # mount -o subvol=save/snap1 /dev/loop1 /mnt
  (crash)
---
 fs/btrfs/super.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
fs/btrfs/super.c +1 -1
index 47bf67c..61bd79a 100644
@@ -685,9 +685,9 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
 		mutex_unlock(&root->d_inode->i_mutex);
 
 		if (IS_ERR(new_root)) {
+			dput(root);
 			deactivate_locked_super(s);
 			error = PTR_ERR(new_root);
-			dput(root);
 			goto error_free_subvol_name;
 		}
 		if (!new_root->d_inode) {
Signature · 1 line
1.6.3
#1 lore raw
Quoted 4 lines · Li Zefan

We should drop dentry before deactivating the superblock, otherwise we can hit this bug:

BUG: Dentry f349a690{i=3D100,n=3D/} still in use (1) [unmount of btrf=

s loop1]

fs/btrfs/super.c static int btrfs_get_sb(struct file_system_type *=

Quoted 22 lines

...

Steps to reproduce the bug:

=A0# mount /dev/loop1 /mnt
=A0# mkdir save
=A0# btrfs subvolume snapshot /mnt save/snap1
=A0# umount /mnt
=A0# mount -o subvol=3Dsave/snap1 /dev/loop1 /mnt
=A0(crash)

---
=A0fs/btrfs/super.c | =A0 =A02 +-
=A01 files changed, 1 insertions(+), 1 deletions(-)

fs/btrfs/super.c +0 -0
index 47bf67c..61bd79a 100644
@@ -685,9 +685,9 @@ static int btrfs_get_sb(struct file_system_type *=

fs_type, int flags,

Quoted 5 lines
fs/btrfs/super.c +1 -0
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0mutex_unlock(&root->d_inode->i_mutex);
 
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (IS_ERR(new_root)) {
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 dput(root);

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0deactivate_locked_supe=

r(s);

Quoted 1 line

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0error =3D PTR_ERR(new_=

root);

Quoted 2 lines

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 dput(root); =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0goto error_free_subvol=

_name;

Quoted 3 lines

=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (!new_root->d_inode) { --

this seems very reasonable to me... more than once i have wanted to be able to mount in this way (while working out system rollback schemes in particular; mount by name doesn't care what the ID is). what's the possibility of a patch to mount an arbitrarily nested subvol?

btw, patch posted regarding the above:

http://www.spinics.net/lists/linux-btrfs/msg07191.html

though as author noted, needs overview by more experienced eyes.

C Anthony
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" = in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

author
#2 lore raw
Quoted 29 lines · C Anthony Risinger
Quoted 28 lines · Li Zefan

We should drop dentry before deactivating the superblock, otherwise we can hit this bug:

BUG: Dentry f349a690{i=100,n=/} still in use (1) [unmount of btrfs loop1]

...

Steps to reproduce the bug:

 # mount /dev/loop1 /mnt
 # mkdir save
 # btrfs subvolume snapshot /mnt save/snap1
 # umount /mnt
 # mount -o subvol=save/snap1 /dev/loop1 /mnt
 (crash)
---
 fs/btrfs/super.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
fs/btrfs/super.c +0 -0
index 47bf67c..61bd79a 100644
@@ -685,9 +685,9 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
               mutex_unlock(&root->d_inode->i_mutex);
 
Quoted 15 lines

fs/btrfs/super.c static int btrfs_get_sb(struct file_system_type *fs_type, int flags,

Quoted 9 lines
fs/btrfs/super.c +1 -2
               if (IS_ERR(new_root)) {
+                       dput(root);
                       deactivate_locked_super(s);
                       error = PTR_ERR(new_root);
-                       dput(root);
                       goto error_free_subvol_name;
               }
               if (!new_root->d_inode) {
--

this seems very reasonable to me... more than once i have wanted to be able to mount in this way (while working out system rollback schemes in particular; mount by name doesn't care what the ID is). what's the possibility of a patch to mount an arbitrarily nested subvol?

I guess it's just because not many people cared much about this, and no one coded it up?

Quoted 6 lines

btw, patch posted regarding the above:

http://www.spinics.net/lists/linux-btrfs/msg07191.html

though as author noted, needs overview by more experienced eyes.