Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 161b8be2 authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe
Browse files

nvme-pci: initialize queue memory before interrupts 



A spurious interrupt before the nvme driver has initialized the completion
queue may inadvertently cause the driver to believe it has a completion
to process. This may result in a NULL dereference since the nvmeq's tags
are not set at this point.

The patch initializes the host's CQ memory so that a spurious interrupt
isn't mistaken for a real completion.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent deb61742

drivers/nvme/host/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -1313,11 +1313,11 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid) 
	if (result < 0)

		goto release_cq;



	nvme_init_queue(nvmeq, qid);

	result = queue_request_irq(nvmeq);

	if (result < 0)

		goto release_sq;



	nvme_init_queue(nvmeq, qid);

	return result;



 release_sq:
@@ -1464,6 +1464,7 @@ static int nvme_pci_configure_admin_queue(struct nvme_dev *dev) 
		return result;



	nvmeq->cq_vector = 0;

	nvme_init_queue(nvmeq, 0);

	result = queue_request_irq(nvmeq);

	if (result) {

		nvmeq->cq_vector = -1;
@@ -2156,7 +2157,6 @@ static void nvme_reset_work(struct work_struct *work) 
	if (result)

		goto out;



	nvme_init_queue(dev->queues[0], 0);

	result = nvme_alloc_admin_tags(dev);

	if (result)

		goto out;