]> git.hungrycats.org Git - linux/commitdiff
btrfs: remove devid kobject when deleting a missing device
authorCheng Yongkang <teel4res@gmail.com>
Mon, 26 Oct 2026 10:51:09 +0000 (03:51 -0700)
committerZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Mon, 2 Nov 2026 02:06:49 +0000 (21:06 -0500)
btrfs_rm_device() removes the sysfs device entry only when
device->bdev_file is non-NULL.  A missing device (created by
add_missing_dev() for an absent disk) has bdev_file == NULL, but
btrfs_sysfs_add_device() still registers its devid kobject under
/sys/fs/btrfs/<uuid>/devinfo/<devid>.

When such a device is deleted, btrfs_free_device() frees the
btrfs_device while the devid kobject remains registered.  The kobject
is embedded in the freed btrfs_device and its show functions use
container_of() to reach it, so reading any devinfo attribute is a
use-after-free:

  BUG: KASAN: slab-use-after-free in sysfs_kf_seq_show+0x157/0x490
  Read of size 8 at addr ffff88801d8172a8 by task poc/9385
  ...
  Freed by task 9385:
   kfree
   btrfs_rm_device+0x11ee/0x17b0
   btrfs_ioctl_rm_dev+0x265/0x400
  Allocated by task 9390:
   btrfs_alloc_device+0x7e/0x400
   device_list_add
   btrfs_scan_one_device
   btrfs_control_ioctl

The freed object is kmalloc-1k and the faulting access is 680 bytes
inside it (offsetof(struct btrfs_device, devid_kobj) = 640 plus
offsetof(struct kobject, ktype) = 40), confirming the embedded
devid_kobj.

btrfs_sysfs_remove_device() already skips the block-device link when
device->bdev is NULL and only touches the devid kobject when it is
initialized.  Call it for missing devices too.

Link: https://lore.kernel.org/all/20261025180252.349049-1-teel4res@gmail.com/
Fixes: 668e48af7a94 ("btrfs: sysfs, add devid/dev_state kobject and device attributes")
Cc: stable@vger.kernel.org
Reviewed-by: Qu Wenruo <wqu@suse.com>
Assisted-by: LLM
Signed-off-by: Cheng Yongkang <teel4res@gmail.com>
Link: https://lore.kernel.org/r/20261026105109.1148939-1-teel4res@gmail.com
fs/btrfs/volumes.c

index 6205469e8a112a293ca86d98e931f9fb8a27766f..ca6fc702d94bc9c886af91fef2f97223e8ba5a89 100644 (file)
@@ -2397,11 +2397,11 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info,
 
        btrfs_assign_next_active_device(device, NULL);
 
-       if (device->bdev_file) {
+       if (device->bdev_file)
                cur_devices->open_devices--;
-               /* remove sysfs entry */
-               btrfs_sysfs_remove_device(device);
-       }
+
+       /* remove sysfs entry, including for a missing device */
+       btrfs_sysfs_remove_device(device);
 
        num_devices = btrfs_super_num_devices(fs_info->super_copy) - 1;
        btrfs_set_super_num_devices(fs_info->super_copy, num_devices);