Skip to content

Commit

Permalink
Btrfs: fix use-after-free in __btrfs_end_transaction
Browse files Browse the repository at this point in the history
49b25e0 introduced a use-after-free bug
that caused spurious -EIO's to be returned.

Do the check before we free the transaction.

Cc: David Sterba <dsterba@suse.cz>
Cc: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
  • Loading branch information
Dave Jones authored and Chris Mason committed Apr 12, 2012
1 parent e627ee7 commit 4edc2ca
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions fs/btrfs/transaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,7 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
struct btrfs_transaction *cur_trans = trans->transaction;
struct btrfs_fs_info *info = root->fs_info;
int count = 0;
int err = 0;

if (--trans->use_count) {
trans->block_rsv = trans->orig_rsv;
Expand Down Expand Up @@ -532,18 +533,18 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,

if (current->journal_info == trans)
current->journal_info = NULL;
memset(trans, 0, sizeof(*trans));
kmem_cache_free(btrfs_trans_handle_cachep, trans);

if (throttle)
btrfs_run_delayed_iputs(root);

if (trans->aborted ||
root->fs_info->fs_state & BTRFS_SUPER_FLAG_ERROR) {
return -EIO;
err = -EIO;
}

return 0;
memset(trans, 0, sizeof(*trans));
kmem_cache_free(btrfs_trans_handle_cachep, trans);
return err;
}

int btrfs_end_transaction(struct btrfs_trans_handle *trans,
Expand Down

0 comments on commit 4edc2ca

Please sign in to comment.