btrfs: reject refs=0 subvolume without DEAD in SUBVOL_SYNC_WAIT
PATCH 1/1 btrfs: reject refs=0 subvolume without DEAD in SUBVOL_SYNC_WAIT
A crafted image can leave a tree-root ROOT_ITEM with refs==0 and without BTRFS_ROOT_SUBVOL_DEAD, plus a matching orphan item. Mount accepts it, and btrfs_ioctl_subvol_sync() then reaches
ASSERT(root_flags & BTRFS_ROOT_SUBVOL_DEAD, ...)
which is BUG() on CONFIG_BTRFS_ASSERT=y.
Return -EUCLEAN instead of asserting, and log the inconsistent state.
The ioctl BUG was reproduced in 2/4 baseline boots (the other two lost a race to the same image's unrelated cleaner WARN). With this change the ioctl returns -EUCLEAN and no BUG; a normal btrfs mount/write/ readback/check regression passes.
--- fs/btrfs/ioctl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/btrfs/ioctl.c +6 -2
@@ -5149,8 +5149,12 @@ static int btrfs_ioctl_subvol_sync(struct btrfs_fs_info *fs_info, void __user *areturn -ENOENT ; wait_for_deletion = true; -ASSERT (root_flags &BTRFS_ROOT_SUBVOL_DEAD ,"root_flags=0x%llx" , - root_flags); +if (!(root_flags &BTRFS_ROOT_SUBVOL_DEAD )) { +btrfs_err (fs_info, +"subvol %llu has refs 0 without DEAD flag" , + args.subvolid); +return -EUCLEAN ; + } sched_ret =schedule_timeout_interruptible (HZ );/* Early wake up or error. */ if (sched_ret !=0 )
Signature · 1 line
2.34.1
Quoted 26 lines · Cheng Yongkang
A crafted image can leave a tree-root
ROOT_ITEMwith refs==0 and withoutBTRFS_ROOT_SUBVOL_DEAD, plus a matching orphan item. Mount accepts it, andbtrfs_ioctl_subvol_sync()then reaches
ASSERT(root_flags & BTRFS_ROOT_SUBVOL_DEAD, ...)which is
BUG()onCONFIG_BTRFS_ASSERT=y.Return
-EUCLEANinstead of asserting, and log the inconsistent state.The ioctl BUG was reproduced in 2/4 baseline boots (the other two lost a race to the same image's unrelated cleaner WARN). With this change the ioctl returns
-EUCLEANand no BUG; a normal btrfs mount/write/ readback/check regression passes.Assisted-by LLMSigned-off-by Cheng Yongkang <[email protected]>--- fs/btrfs/ioctl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)fs/btrfs/ioctl.c +0
-0
fs/btrfs/ioctl.c static int btrfs_ioctl_subvol_sync(struct btrfs_fs_info *fs_info, void __user *a · line 5152
Quoted 6 lines
fs/btrfs/ioctl.c +1
-2@@ -5149,8 +5149,12 @@ static int btrfs_ioctl_subvol_sync(struct btrfs_fs_info *fs_info, void __user *areturn -ENOENT ; wait_for_deletion = true; -ASSERT (root_flags &BTRFS_ROOT_SUBVOL_DEAD ,"root_flags=0x%llx" , - root_flags); +if (!(root_flags &BTRFS_ROOT_SUBVOL_DEAD )) {
Use unlikely().
Secondly it's still possible to hit a subvolume without DEAD flag at runtime.
btrfs_ioctl_snap_destroy()
|- btrfs_delete_subvolume()
|- btrfs_set_root_flags( | SUBVOL_DEAD) |- Some error hit, goto out_end_trans or out_undead tag |- btrfs_set_root_flags( & ~SUBVOL_DEAD)
Although in that case, the transaction is already aborted, so no on-disk metadata is corrupted.
Then someone can still call the ioctl on the subvolume and trigger the warning.
Although this is not a regression, but a pre-existing problem, I'd suggest to do some writeable checks for the SYNC_WAIT ioctl.
Quoted 8 lines
fs/btrfs/ioctl.c +5
-0+btrfs_err (fs_info, +"subvol %llu has refs 0 without DEAD flag" , + args.subvolid); +return -EUCLEAN ; + } sched_ret =schedule_timeout_interruptible (HZ );/* Early wake up or error. */ if (sched_ret !=0 )
Hi Qu,
Thanks for pointing out the failed-delete path. v2 is here:
https://lore.kernel.org/linux-btrfs/[email protected]/
Before waiting for a deleted subvolume, it now returns -EROFS if the filesystem is read-only. The check runs on every iteration, so it also covers a filesystem that becomes read-only during the wait. On a writable filesystem, a zero-reference root without DEAD returns -EUCLEAN, with unlikely(). Subvolumes that were not deleted or do not exist still return -EEXIST and -ENOENT.
Thanks,
Cheng Yongkang