btrfs: fix double inode unlock for direct IO sync writes

Commit Message

Filipe Manana Aug. 2, 2024, 8:44 a.m. UTC

From: Filipe Manana <[e-mail]>

If we do a direct IO sync write, at btrfs_sync_file(), and we need to skip
inode logging or we get an error starting a transaction or an error when
flushing delalloc, we end up unlocking the inode when we shouldn't under
the 'out_release_extents' label.

Fix that by checking if we have to skip inode locking/unlocking under
that label.

Reported-by: [e-mail]
Link: https://lore.kernel.org/linux-btrfs/[e-mail]/
Fixes: 939b656bc8ab ("btrfs: fix corruption after buffer fault in during direct IO append write")
Signed-off-by: Filipe Manana <[e-mail]>
---
 fs/btrfs/file.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Josef Bacik Aug. 2, 2024, 3:54 p.m. UTC | #1

On Fri, Aug 02, 2024 at 09:44:52AM +0100, [e-mail] wrote:
> From: Filipe Manana <[e-mail]>
> 
> If we do a direct IO sync write, at btrfs_sync_file(), and we need to skip
> inode logging or we get an error starting a transaction or an error when
> flushing delalloc, we end up unlocking the inode when we shouldn't under
> the 'out_release_extents' label.
> 
> Fix that by checking if we have to skip inode locking/unlocking under
> that label.
> 
> Reported-by: [e-mail]
> Link: https://lore.kernel.org/linux-btrfs/[e-mail]/
> Fixes: 939b656bc8ab ("btrfs: fix corruption after buffer fault in during direct IO append write")
> Signed-off-by: Filipe Manana <[e-mail]>

Heh I just saw this syzbot thing and came to the list to see if you fixed it,

Reviewed-by: Josef Bacik <[e-mail]>

Thanks,

Josef

Patch

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index d742c04931d6..76f4cc686af9 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1868,7 +1868,10 @@  int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
 
 out_release_extents:
 	btrfs_release_log_ctx_extents(&ctx);
-	btrfs_inode_unlock(inode, BTRFS_ILOCK_MMAP);
+	if (skip_ilock)
+		up_write(&inode->i_mmap_lock);
+	else
+		btrfs_inode_unlock(inode, BTRFS_ILOCK_MMAP);
 	goto out;
 }