Skip to contentSkip to conversation

btrfs: turn fs_roots_radix in btrfs_fs_info into an XArray

bug report Dan Carpenter 2 participants 2 messages May 4, 2022 – May 11, 2022 Btrfs file system

lore
Share & tools
lore
#0 lore raw

Hello Gabriel Niebler,

The patch eb8da5bf4831: "btrfs: turn fs_roots_radix in btrfs_fs_info into an XArray" from Apr 26, 2022, leads to the following Smatch static checker warning:

fs/btrfs/disk-io.c:4453 btrfs_cleanup_fs_roots() error: uninitialized symbol 'i'. fs/btrfs/disk-io.c:4453 btrfs_cleanup_fs_roots() error: uninitialized symbol 'grabbed'.

fs/btrfs/disk-io.c

    4408 int btrfs_cleanup_fs_roots(struct btrfs_fs_info *fs_info)
    4409 {
    4410         struct btrfs_root *roots[8];
    4411         unsigned long index = 0;
    4412         int i;
    4413         int err = 0;
    4414         int grabbed;
    4415 
    4416         while (1) {
    4417                 struct btrfs_root *root;
    4418 
    4419                 spin_lock(&fs_info->fs_roots_lock);
    4420                 if (!xa_find(&fs_info->fs_roots, &index, ULONG_MAX, XA_PRESENT)) {
    4421                         spin_unlock(&fs_info->fs_roots_lock);
    4422                         break;

"i" and "grabbed" are uninitialized if we hit this break statement on the first iteration through the loop.

roots is also uninitialized. This error handling is badly broken.

If we hit it on the second iteration then we are also toasted. Double frees. I think. (Trying to send emails quickly and then head out the door).

    4423                 }
    4424 
    4425                 grabbed = 0;
    4426                 xa_for_each_start(&fs_info->fs_roots, index, root, index) {
    4427                         /* Avoid grabbing roots in dead_roots */
    4428                         if (btrfs_root_refs(&root->root_item) == 0) {
    4429                                 roots[grabbed] = NULL;
    4430                         } else {
    4431                                 /* Grab all the search results for later use */
    4432                                 roots[grabbed] = btrfs_grab_root(root);
    4433                         }
    4434                         grabbed++;
    4435                         if (grabbed >= ARRAY_SIZE(roots))
    4436                                 break;
    4437                 }
    4438                 spin_unlock(&fs_info->fs_roots_lock);
    4439 
    4440                 for (i = 0; i < grabbed; i++) {
    4441                         if (!roots[i])
    4442                                 continue;
    4443                         index = roots[i]->root_key.objectid;
    4444                         err = btrfs_orphan_cleanup(roots[i]);
    4445                         if (err)
    4446                                 break;

Imagine we hit this break. Double frees as well.

    4447                         btrfs_put_root(roots[i]);
    4448                 }
    4449                 index++;
    4450         }
    4451 
    4452         /* Release the roots that remain uncleaned due to error */
--> 4453         for (; i < grabbed; i++) {
                        ^^^^^^^^^^^

    4454                 if (roots[i])
    4455                         btrfs_put_root(roots[i]);
    4456         }
    4457         return err;
    4458 }

regards,
dan carpenter

#1 lore raw
Quoted 26 lines · Dan Carpenter

Hello Gabriel Niebler,

The patch eb8da5bf4831: "btrfs: turn fs_roots_radix in btrfs_fs_info into an XArray" from Apr 26, 2022, leads to the following Smatch static checker warning:

fs/btrfs/disk-io.c:4453 btrfs_cleanup_fs_roots() error: uninitialized symbol 'i'. fs/btrfs/disk-io.c:4453 btrfs_cleanup_fs_roots() error: uninitialized symbol 'grabbed'.

fs/btrfs/disk-io.c

    4408 int btrfs_cleanup_fs_roots(struct btrfs_fs_info *fs_info)
    4409 {
    4410         struct btrfs_root *roots[8];
    4411         unsigned long index = 0;
    4412         int i;
    4413         int err = 0;
    4414         int grabbed;
    4415 
    4416         while (1) {
    4417                 struct btrfs_root *root;
    4418 
    4419                 spin_lock(&fs_info->fs_roots_lock);
    4420                 if (!xa_find(&fs_info->fs_roots, &index, ULONG_MAX, XA_PRESENT)) {
    4421                         spin_unlock(&fs_info->fs_roots_lock);
    4422                         break;
Quoted 8 lines

"i" and "grabbed" are uninitialized if we hit this break statement on the first iteration through the loop.

roots is also uninitialized. This error handling is badly broken.

If we hit it on the second iteration then we are also toasted. Double frees. I think. (Trying to send emails quickly and then head out the door).

Thanks for the report, this has been meanwhile fixed in the tree, Nikolay sent a fixup that replaced break with return.