block: unhash blkdev part inode when the part is deleted
Subsystems (2)
PATCH 1/1 block: unhash blkdev part inode when the part is deleted
v5.11 changes the blkdev lookup mechanism completely since commit 22ae8ce8b892 ("block: simplify bdev/disk lookup in blkdev_get"), and small part of the change is to unhash part bdev inode when deleting partition. Turns out this kind of change does fix one nasty issue in case of BLOCK_EXT_MAJOR:
1) when one partition is deleted & closed, disk_put_part() is always called before bdput(bdev), see blkdev_put(); so the part's devt can be freed & re-used before the inode is dropped
2) then new partition with same devt can be created just before the inode in 1) is dropped, then the old inode/bdev structurein 1) is re-used for this new partition, this way causes use-after-free and kernel panic.
It isn't possible to backport the whole big patchset of "merge struct block_device and struct hd_struct v4" for addressing this issue.
https://lore.kernel.org/linux-block/[email protected]/
So fixes it by unhashing part bdev in delete_partition(), and this way is actually aligned with v5.11+'s behavior.
Backported from the following 5.10.y commit:
5f2f77560591 ("block: unhash blkdev part inode when the part is deleted")
--- block/partition-generic.c | 6 ++++++ 1 file changed, 6 insertions(+)
block/partition-generic.c +6 -0
@@ -254,6 +254,7 @@ void delete_partition(struct gendisk *disk, int partno) {struct disk_part_tbl *ptbl = disk->part_tbl;struct hd_struct *part; +struct block_device *bdev;if (partno >= ptbl->len)return ;
@@ -267,6 +268,11 @@ void delete_partition(struct gendisk *disk, int partno)kobject_put (part->holder_dir);device_del (part_to_dev (part)); + bdev =bdget (part_devt (part)); +if (bdev) { +remove_inode_hash (bdev->bd_inode); +bdput (bdev); + }hd_struct_kill (part); }
Signature · 1 line
2.38.1
kernel test robot
build botFYI: kernel test robot notices the stable kernel rule is not satisfied.
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
Rule: 'Cc: [email protected]' or 'commit <sha1> upstream.'
Subject: [PATCH stable 4.9.y] block: unhash blkdev part inode when the part is deleted
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
Greg Kroah-Hartman
maintainerQuoted 27 lines · Ming Lei
v5.11 changes the blkdev lookup mechanism completely since commit
22ae8ce8b892("block: simplify bdev/disk lookup inblkdev_get"), and small part of the change is to unhash part bdev inode when deleting partition. Turns out this kind of change does fix one nasty issue in case ofBLOCK_EXT_MAJOR:1) when one partition is deleted & closed,
disk_put_part()is always called before bdput(bdev), seeblkdev_put(); so the part's devt can be freed & re-used before the inode is dropped2) then new partition with same devt can be created just before the inode in 1) is dropped, then the old inode/bdev structurein 1) is re-used for this new partition, this way causes use-after-free and kernel panic.
It isn't possible to backport the whole big patchset of "merge struct
block_deviceand structhd_structv4" for addressing this issue.https://lore.kernel.org/linux-block/[email protected]/
So fixes it by unhashing part bdev in
delete_partition(), and this way is actually aligned with v5.11+'s behavior.Backported from the following 5.10.y commit:
5f2f77560591("block: unhash blkdev part inode when the part is deleted")
Quoted 8 lines
Reported-by Shiwei Cui <[email protected]>Tested-by Shiwei Cui <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Jan Kara <[email protected]>Signed-off-by Ming Lei <[email protected]>--- block/partition-generic.c | 6 ++++++ 1 file changed, 6 insertions(+)
All now queued up, thanks!
greg k-h