diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-09 14:51:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-09 14:51:59 -0700 |
| commit | 50eb0a06e6cae01d8a8d63770030d01ac2fb572a (patch) | |
| tree | 31d45b247b399ff4cb44207cbcfee77950aff94e /block/genhd.c | |
| parent | c75de8453c3e2f8a8fcee9171118b7da29d3fb9c (diff) | |
| parent | 1dbdd99b511c966be9147ad72991a2856ac76f22 (diff) | |
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()
Diffstat (limited to 'block/genhd.c')
| -rw-r--r-- | block/genhd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/genhd.c b/block/genhd.c index 7b6e5e1cf956..496e8458c357 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1268,6 +1268,7 @@ struct gendisk *__alloc_disk_node(struct request_queue *q, int node_id, out_destroy_part_tbl: xa_destroy(&disk->part_tbl); + disk->part0->bd_disk = NULL; iput(disk->part0->bd_inode); out_free_bdi: bdi_put(disk->bdi); |