diff options
| author |   Christoph Hellwig <hch@lst.de> | 2021-08-16 15:46:24 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2021-08-23 12:54:31 -0600 |
| commit | d152c682f03ceb65c0d9663d4ba6ee2d46aa784d (patch) | |
| tree | 31cc1a85256072b4d65d881472c2f6ace7c10178 /block/bfq-iosched.c | |
| parent | block: hold a request_queue reference for the lifetime of struct gendisk (diff) | |
| download | linux-dev-d152c682f03ceb65c0d9663d4ba6ee2d46aa784d.tar.xz linux-dev-d152c682f03ceb65c0d9663d4ba6ee2d46aa784d.zip | |
block: add an explicit ->disk backpointer to the request_queue
Replace the magic lookup through the kobject tree with an explicit
backpointer, given that the device model links are set up and torn
down at times when I/O is still possible, leading to potential
NULL or invalid pointer dereferences.
Fixes: edb0872f44ec ("block: move the bdi from the request_queue to the gendisk")
Reported-by: syzbot <syzbot+aa0801b6b32dca9dda82@syzkaller.appspotmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Sven Schnelle <svens@linux.ibm.com>
Link: https://lore.kernel.org/r/20210816134624.GA24234@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/bfq-iosched.c')
| -rw-r--r-- | block/bfq-iosched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index e92bc0348433..480e1a134859 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5269,7 +5269,7 @@ bfq_set_next_ioprio_data(struct bfq_queue *bfqq, struct bfq_io_cq *bic) switch (ioprio_class) { default: pr_err("bdi %s: bfq: bad prio class %d\n", - bdi_dev_name(queue_to_disk(bfqq->bfqd->queue)->bdi), + bdi_dev_name(bfqq->bfqd->queue->disk->bdi), ioprio_class); fallthrough; case IOPRIO_CLASS_NONE: |