commit 50eb0a06e6cae01d8a8d63770030d01ac2fb572a · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Merge tag 'block-5.15-2021-10-09' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
"Two small fixes for this release:

- Add missing QUEUE_FLAG_HCTX_ACTIVE in the debugfs handling
(Johannes)

- Fix double free / UAF issue in __alloc_disk_node (Tetsuo)"

* tag 'block-5.15-2021-10-09' of git://git.kernel.dk/linux-block:
block: decode QUEUE_FLAG_HCTX_ACTIVE in debugfs output
block: genhd: fix double kfree() in __alloc_disk_node()

Linus Torvalds 4 years ago 50eb0a06 c75de845

+3 -1

3 changed files

expand all

unified split

block

bdev.c

blk-mq-debugfs.c

genhd.c

+1 -1

block/bdev.c

··· 490 490 bdev = I_BDEV(inode); 491 491 mutex_init(&bdev->bd_fsfreeze_mutex); 492 492 spin_lock_init(&bdev->bd_size_lock); 493 - bdev->bd_disk = disk; 494 493 bdev->bd_partno = partno; 495 494 bdev->bd_inode = inode; 496 495 bdev->bd_stats = alloc_percpu(struct disk_stats); ··· 497 498 iput(inode); 498 499 return NULL; 499 500 } 501 + bdev->bd_disk = disk; 500 502 return bdev; 501 503 } 502 504

block/blk-mq-debugfs.c

··· 129 129 QUEUE_FLAG_NAME(PCI_P2PDMA), 130 130 QUEUE_FLAG_NAME(ZONE_RESETALL), 131 131 QUEUE_FLAG_NAME(RQ_ALLOC_TIME), 132 + QUEUE_FLAG_NAME(HCTX_ACTIVE), 132 133 QUEUE_FLAG_NAME(NOWAIT), 133 134 }; 134 135 #undef QUEUE_FLAG_NAME

block/genhd.c

··· 1268 1268 1269 1269 out_destroy_part_tbl: 1270 1270 xa_destroy(&disk->part_tbl); 1271 + disk->part0->bd_disk = NULL; 1271 1272 iput(disk->part0->bd_inode); 1272 1273 out_free_bdi: 1273 1274 bdi_put(disk->bdi);