Btrfs: fix log context list corruption after rename whiteout error
PATCH 1/1 Btrfs: fix log context list corruption after rename whiteout error
From: Filipe Manana <[email protected]>
During a rename whiteout, if btrfs_whiteout_for_rename() returns an error we can end up returning from btrfs_rename() with the log context object still in the root's log context list - this happens if 'sync_log' was set to true before we called btrfs_whiteout_for_rename() and it is dangerous because we end up with a corrupt linked list (root->log_ctxs) as the log context object was allocated on the stack.
After btrfs_rename() returns, any task that is running btrfs_sync_log() concurrently can end up crashing because that linked list is traversed by btrfs_sync_log() (through btrfs_remove_all_log_ctxs()). That results in the same issue that commit e6c617102c7e4 ("Btrfs: fix log context list corruption after rename exchange operation") fixed.
--- fs/btrfs/inode.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/btrfs/inode.c +4 -0
@@ -9546,6 +9546,10 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry, ret =btrfs_sync_log (trans,BTRFS_I (old_inode)->root, &ctx);if (ret) commit_transaction = true; + }else if (sync_log) { +mutex_lock (&root->log_mutex); +list_del (&ctx.list); +mutex_unlock (&root->log_mutex); }if (commit_transaction) { ret =btrfs_commit_transaction (trans);
Signature · 1 line
2.11.0
Quoted 9 lines · On Tue, Mar 10, 2020 at 12:13:53PM +0000, [email protected] wrote:
From: Filipe Manana <[email protected]>
During a rename whiteout, if
btrfs_whiteout_for_rename()returns an error we can end up returning frombtrfs_rename()with the log context object still in the root's log context list - this happens if 'sync_log' was set to true before we calledbtrfs_whiteout_for_rename()and it is dangerous because we end up with a corrupt linked list (root->log_ctxs) as the log context object was allocated on the stack.
Quoted 8 lines
After
btrfs_rename()returns, any task that is runningbtrfs_sync_log()concurrently can end up crashing because that linked list is traversed bybtrfs_sync_log()(throughbtrfs_remove_all_log_ctxs()). That results in the same issue that commite6c617102c7e4("Btrfs: fix log context list corruption after rename exchange operation") fixed.Fixes d4682ba03ef618 ("Btrfs: sync log after logging new name")Signed-off-by Filipe Manana <[email protected]>
Added to misc-next, thanks.