Sfoglia il codice sorgente

Btrfs: fix use-after-free in __btrfs_end_transaction

49b25e0540904be0bf558b84475c69d72e4de66e 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>
Dave Jones 13 anni fa
parent
commit
4edc2ca388
1 ha cambiato i file con 5 aggiunte e 4 eliminazioni
  1. 5 4
      fs/btrfs/transaction.c

+ 5 - 4
fs/btrfs/transaction.c

@@ -480,6 +480,7 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
 	struct btrfs_transaction *cur_trans = trans->transaction;
 	struct btrfs_transaction *cur_trans = trans->transaction;
 	struct btrfs_fs_info *info = root->fs_info;
 	struct btrfs_fs_info *info = root->fs_info;
 	int count = 0;
 	int count = 0;
+	int err = 0;
 
 
 	if (--trans->use_count) {
 	if (--trans->use_count) {
 		trans->block_rsv = trans->orig_rsv;
 		trans->block_rsv = trans->orig_rsv;
@@ -532,18 +533,18 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
 
 
 	if (current->journal_info == trans)
 	if (current->journal_info == trans)
 		current->journal_info = NULL;
 		current->journal_info = NULL;
-	memset(trans, 0, sizeof(*trans));
-	kmem_cache_free(btrfs_trans_handle_cachep, trans);
 
 
 	if (throttle)
 	if (throttle)
 		btrfs_run_delayed_iputs(root);
 		btrfs_run_delayed_iputs(root);
 
 
 	if (trans->aborted ||
 	if (trans->aborted ||
 	    root->fs_info->fs_state & BTRFS_SUPER_FLAG_ERROR) {
 	    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,
 int btrfs_end_transaction(struct btrfs_trans_handle *trans,