Skip to content

Commit e2b54ea

Browse files
fdmananakdave
authored andcommitted
btrfs: fix double free of anonymous device after snapshot creation failure
When creating a snapshot we may do a double free of an anonymous device in case there's an error committing the transaction. The second free may result in freeing an anonymous device number that was allocated by some other subsystem in the kernel or another btrfs filesystem. The steps that lead to this: 1) At ioctl.c:create_snapshot() we allocate an anonymous device number and assign it to pending_snapshot->anon_dev; 2) Then we call btrfs_commit_transaction() and end up at transaction.c:create_pending_snapshot(); 3) There we call btrfs_get_new_fs_root() and pass it the anonymous device number stored in pending_snapshot->anon_dev; 4) btrfs_get_new_fs_root() frees that anonymous device number because btrfs_lookup_fs_root() returned a root - someone else did a lookup of the new root already, which could some task doing backref walking; 5) After that some error happens in the transaction commit path, and at ioctl.c:create_snapshot() we jump to the 'fail' label, and after that we free again the same anonymous device number, which in the meanwhile may have been reallocated somewhere else, because pending_snapshot->anon_dev still has the same value as in step 1. Recently syzbot ran into this and reported the following trace: ------------[ cut here ]------------ ida_free called for id=51 which is not allocated. WARNING: CPU: 1 PID: 31038 at lib/idr.c:525 ida_free+0x370/0x420 lib/idr.c:525 Modules linked in: CPU: 1 PID: 31038 Comm: syz-executor.2 Not tainted 6.8.0-rc4-syzkaller-00410-gc02197fc9076 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/25/2024 RIP: 0010:ida_free+0x370/0x420 lib/idr.c:525 Code: 10 42 80 3c 28 (...) RSP: 0018:ffffc90015a67300 EFLAGS: 00010246 RAX: be5130472f5dd000 RBX: 0000000000000033 RCX: 0000000000040000 RDX: ffffc90009a7a000 RSI: 000000000003ffff RDI: 0000000000040000 RBP: ffffc90015a673f0 R08: ffffffff81577992 R09: 1ffff92002b4cdb4 R10: dffffc0000000000 R11: fffff52002b4cdb5 R12: 0000000000000246 R13: dffffc0000000000 R14: ffffffff8e256b80 R15: 0000000000000246 FS: 00007fca3f4b46c0(0000) GS:ffff8880b9500000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f167a17b978 CR3: 000000001ed26000 CR4: 0000000000350ef0 Call Trace: <TASK> btrfs_get_root_ref+0xa48/0xaf0 fs/btrfs/disk-io.c:1346 create_pending_snapshot+0xff2/0x2bc0 fs/btrfs/transaction.c:1837 create_pending_snapshots+0x195/0x1d0 fs/btrfs/transaction.c:1931 btrfs_commit_transaction+0xf1c/0x3740 fs/btrfs/transaction.c:2404 create_snapshot+0x507/0x880 fs/btrfs/ioctl.c:848 btrfs_mksubvol+0x5d0/0x750 fs/btrfs/ioctl.c:998 btrfs_mksnapshot+0xb5/0xf0 fs/btrfs/ioctl.c:1044 __btrfs_ioctl_snap_create+0x387/0x4b0 fs/btrfs/ioctl.c:1306 btrfs_ioctl_snap_create_v2+0x1ca/0x400 fs/btrfs/ioctl.c:1393 btrfs_ioctl+0xa74/0xd40 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:871 [inline] __se_sys_ioctl+0xfe/0x170 fs/ioctl.c:857 do_syscall_64+0xfb/0x240 entry_SYSCALL_64_after_hwframe+0x6f/0x77 RIP: 0033:0x7fca3e67dda9 Code: 28 00 00 00 (...) RSP: 002b:00007fca3f4b40c8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 00007fca3e7abf80 RCX: 00007fca3e67dda9 RDX: 00000000200005c0 RSI: 0000000050009417 RDI: 0000000000000003 RBP: 00007fca3e6ca47a R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 000000000000000b R14: 00007fca3e7abf80 R15: 00007fff6bf95658 </TASK> Where we get an explicit message where we attempt to free an anonymous device number that is not currently allocated. It happens in a different code path from the example below, at btrfs_get_root_ref(), so this change may not fix the case triggered by syzbot. To fix at least the code path from the example above, change btrfs_get_root_ref() and its callers to receive a dev_t pointer argument for the anonymous device number, so that in case it frees the number, it also resets it to 0, so that up in the call chain we don't attempt to do the double free. CC: [email protected] # 5.10+ Link: https://lore.kernel.org/linux-btrfs/[email protected]/ Fixes: e03ee2f ("btrfs: do not ASSERT() if the newly created subvolume already got read") Signed-off-by: Filipe Manana <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 418b090 commit e2b54ea

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

fs/btrfs/disk-io.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,12 +1307,12 @@ void btrfs_free_fs_info(struct btrfs_fs_info *fs_info)
13071307
*
13081308
* @objectid: root id
13091309
* @anon_dev: preallocated anonymous block device number for new roots,
1310-
* pass 0 for new allocation.
1310+
* pass NULL for a new allocation.
13111311
* @check_ref: whether to check root item references, If true, return -ENOENT
13121312
* for orphan roots
13131313
*/
13141314
static struct btrfs_root *btrfs_get_root_ref(struct btrfs_fs_info *fs_info,
1315-
u64 objectid, dev_t anon_dev,
1315+
u64 objectid, dev_t *anon_dev,
13161316
bool check_ref)
13171317
{
13181318
struct btrfs_root *root;
@@ -1342,9 +1342,9 @@ static struct btrfs_root *btrfs_get_root_ref(struct btrfs_fs_info *fs_info,
13421342
* that common but still possible. In that case, we just need
13431343
* to free the anon_dev.
13441344
*/
1345-
if (unlikely(anon_dev)) {
1346-
free_anon_bdev(anon_dev);
1347-
anon_dev = 0;
1345+
if (unlikely(anon_dev && *anon_dev)) {
1346+
free_anon_bdev(*anon_dev);
1347+
*anon_dev = 0;
13481348
}
13491349

13501350
if (check_ref && btrfs_root_refs(&root->root_item) == 0) {
@@ -1366,7 +1366,7 @@ static struct btrfs_root *btrfs_get_root_ref(struct btrfs_fs_info *fs_info,
13661366
goto fail;
13671367
}
13681368

1369-
ret = btrfs_init_fs_root(root, anon_dev);
1369+
ret = btrfs_init_fs_root(root, anon_dev ? *anon_dev : 0);
13701370
if (ret)
13711371
goto fail;
13721372

@@ -1402,7 +1402,7 @@ static struct btrfs_root *btrfs_get_root_ref(struct btrfs_fs_info *fs_info,
14021402
* root's anon_dev to 0 to avoid a double free, once by btrfs_put_root()
14031403
* and once again by our caller.
14041404
*/
1405-
if (anon_dev)
1405+
if (anon_dev && *anon_dev)
14061406
root->anon_dev = 0;
14071407
btrfs_put_root(root);
14081408
return ERR_PTR(ret);
@@ -1418,19 +1418,19 @@ static struct btrfs_root *btrfs_get_root_ref(struct btrfs_fs_info *fs_info,
14181418
struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info,
14191419
u64 objectid, bool check_ref)
14201420
{
1421-
return btrfs_get_root_ref(fs_info, objectid, 0, check_ref);
1421+
return btrfs_get_root_ref(fs_info, objectid, NULL, check_ref);
14221422
}
14231423

14241424
/*
14251425
* Get in-memory reference of a root structure, created as new, optionally pass
14261426
* the anonymous block device id
14271427
*
14281428
* @objectid: tree objectid
1429-
* @anon_dev: if zero, allocate a new anonymous block device or use the
1430-
* parameter value
1429+
* @anon_dev: if NULL, allocate a new anonymous block device or use the
1430+
* parameter value if not NULL
14311431
*/
14321432
struct btrfs_root *btrfs_get_new_fs_root(struct btrfs_fs_info *fs_info,
1433-
u64 objectid, dev_t anon_dev)
1433+
u64 objectid, dev_t *anon_dev)
14341434
{
14351435
return btrfs_get_root_ref(fs_info, objectid, anon_dev, true);
14361436
}

fs/btrfs/disk-io.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void btrfs_free_fs_roots(struct btrfs_fs_info *fs_info);
6161
struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info,
6262
u64 objectid, bool check_ref);
6363
struct btrfs_root *btrfs_get_new_fs_root(struct btrfs_fs_info *fs_info,
64-
u64 objectid, dev_t anon_dev);
64+
u64 objectid, dev_t *anon_dev);
6565
struct btrfs_root *btrfs_get_fs_root_commit_root(struct btrfs_fs_info *fs_info,
6666
struct btrfs_path *path,
6767
u64 objectid);

fs/btrfs/ioctl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ static noinline int create_subvol(struct mnt_idmap *idmap,
721721
free_extent_buffer(leaf);
722722
leaf = NULL;
723723

724-
new_root = btrfs_get_new_fs_root(fs_info, objectid, anon_dev);
724+
new_root = btrfs_get_new_fs_root(fs_info, objectid, &anon_dev);
725725
if (IS_ERR(new_root)) {
726726
ret = PTR_ERR(new_root);
727727
btrfs_abort_transaction(trans, ret);

fs/btrfs/transaction.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1834,7 +1834,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
18341834
}
18351835

18361836
key.offset = (u64)-1;
1837-
pending->snap = btrfs_get_new_fs_root(fs_info, objectid, pending->anon_dev);
1837+
pending->snap = btrfs_get_new_fs_root(fs_info, objectid, &pending->anon_dev);
18381838
if (IS_ERR(pending->snap)) {
18391839
ret = PTR_ERR(pending->snap);
18401840
pending->snap = NULL;

0 commit comments

Comments
 (0)