Commit 2b22a1eb authored by Bart Van Assche's avatar Bart Van Assche Committed by Zheng Qixing
Browse files

block: Fix handling of offline queues in blk_mq_alloc_request_hctx() 

mainline inclusion
from mainline-v5.19-rc3
commit 14dc7a18
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBP1ZW
CVE: CVE-2022-49720

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=14dc7a18abbe4176f5626c13c333670da8e06aa1



------------------

This patch prevents that test nvme/004 triggers the following:

UBSAN: array-index-out-of-bounds in block/blk-mq.h:135:9
index 512 is out of range for type 'long unsigned int [512]'
Call Trace:
 show_stack+0x52/0x58
 dump_stack_lvl+0x49/0x5e
 dump_stack+0x10/0x12
 ubsan_epilogue+0x9/0x3b
 __ubsan_handle_out_of_bounds.cold+0x44/0x49
 blk_mq_alloc_request_hctx+0x304/0x310
 __nvme_submit_sync_cmd+0x70/0x200 [nvme_core]
 nvmf_connect_io_queue+0x23e/0x2a0 [nvme_fabrics]
 nvme_loop_connect_io_queues+0x8d/0xb0 [nvme_loop]
 nvme_loop_create_ctrl+0x58e/0x7d0 [nvme_loop]
 nvmf_create_ctrl+0x1d7/0x4d0 [nvme_fabrics]
 nvmf_dev_write+0xae/0x111 [nvme_fabrics]
 vfs_write+0x144/0x560
 ksys_write+0xb7/0x140
 __x64_sys_write+0x42/0x50
 do_syscall_64+0x35/0x80
 entry_SYSCALL_64_after_hwframe+0x44/0xae

Cc: Christoph Hellwig <hch@lst.de>
Cc: Ming Lei <ming.lei@redhat.com>
Fixes: 20e4d813 ("blk-mq: simplify queue mapping & schedule with each possisble CPU")
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20220615210004.1031820-1-bvanassche@acm.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Conflicts:
	block/blk-mq.c
[Due to not merging commit a5ea5811 ("blk-mq: move the call to
blk_queue_enter_live out of blk_mq_get_request").]
Signed-off-by: default avatarZheng Qixing <zhengqixing@huawei.com>
parent a304375c

block/blk-mq.c

+4 −0
Original line number Diff line number Diff line
@@ -515,6 +515,10 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q, 
		return ERR_PTR(-EXDEV);

	}

	cpu = cpumask_first_and(alloc_data.hctx->cpumask, cpu_online_mask);

	if (cpu >= nr_cpu_ids) {

		blk_queue_exit(q);

		return ERR_PTR(-EXDEV);

	}

	alloc_data.ctx = __blk_mq_get_ctx(q, cpu);



	rq = blk_mq_get_request(q, NULL, op, &alloc_data);