Commit ecf4d59a authored Aug 13, 2019 by zhengbin Committed by Jens Axboe Sep 04, 2019

paride/pf: need to set queue to NULL before put_disk



In pf_init_units, if blk_mq_init_sq_queue fails, need to set queue to
NULL before put_disk, otherwise null-ptr-deref Read will occur.

put_disk
  kobject_put
    disk_release
      blk_put_queue(disk->queue)

Fixes: 77218ddf ("paride: convert pf to blk-mq")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: zhengbin <zhengbin13@huawei.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent c5ef62e6

drivers/block/paride/pf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -300,8 +300,8 @@ static void __init pf_init_units(void)
		disk->queue = blk_mq_init_sq_queue(&pf->tag_set, &pf_mq_ops,
		1, BLK_MQ_F_SHOULD_MERGE);
		if (IS_ERR(disk->queue)) {
		put_disk(disk);
		disk->queue = NULL;
		put_disk(disk);
		continue;
		}

Admin message