nvmet: pci-epf: put CQ ref on create_cq mapping failure
Subsystems (3)
PATCH 1/1 nvmet: pci-epf: put CQ ref on create_cq mapping failure
nvmet_pci_epf_create_cq() calls nvmet_cq_create(), which takes a reference on the controller and installs the completion queue. If the subsequent PCI address-space mapping fails or returns a too-small partial mapping, the function jumps to err_internal / err_unmap_queue without calling nvmet_cq_put(). The matching put in nvmet_pci_epf_delete_cq() is gated on NVMET_PCI_EPF_Q_LIVE, which is only set after the mapping succeeds, so teardown never releases these references. A remote PCI host that drives Create IO CQ commands with a failing PRP1/pci_addr therefore leaks the CQ and a controller reference on each attempt.
Drop the CQ reference on the mapping-failure paths. The err_internal and err_unmap_queue labels are only reachable after nvmet_cq_create() has succeeded, so this pairs the create/put correctly.
--- drivers/nvme/target/pci-epf.c | 1 + 1 file changed, 1 insertion(+)
drivers/nvme/target/pci-epf.c +1 -0
@@ -1339,6 +1339,7 @@ static u16 nvmet_pci_epf_create_cq(struct nvmet_ctrl *tctrl,nvmet_pci_epf_mem_unmap (ctrl->nvme_epf, &cq->pci_map); err_internal: status =NVME_SC_INTERNAL |NVME_STATUS_DNR ; +nvmet_cq_put (&cq->nvme_cq); err:if (test_and_clear_bit (NVMET_PCI_EPF_Q_IRQ_ENABLED , &cq->flags))nvmet_pci_epf_remove_irq_vector (ctrl, cq->vector);
Signature · 1 line
2.43.0
Quoted 10 lines · Yifei Gao
nvmet_pci_epf_create_cq()callsnvmet_cq_create(), which takes a reference on the controller and installs the completion queue. If the subsequent PCI address-space mapping fails or returns a too-small partial mapping, the function jumps toerr_internal/err_unmap_queuewithout callingnvmet_cq_put(). The matching put innvmet_pci_epf_delete_cq()is gated onNVMET_PCI_EPF_Q_LIVE, which is only set after the mapping succeeds, so teardown never releases these references. A remote PCI host that drives Create IO CQ commands with a failing PRP1/pci_addr therefore leaks the CQ and a controller reference on each attempt.
Quoted 8 lines
Drop the CQ reference on the mapping-failure paths. The
err_internalanderr_unmap_queuelabels are only reachable afternvmet_cq_create()has succeeded, so this pairs the create/put correctly.Fixes 0faa0fe6f90e ("nvmet: New NVMe PCI endpoint function target driver")Assisted-by Claude:claude-opus-4-8Signed-off-by Yifei Gao <[email protected]>
Looks OK.
Note: it would be nice if could explicitly mention if you actually tested this or if this is just an AI generated fix.
Signature · 2 lines
Damien Le Moal Western Digital Research
Quoted 10 lines · Yifei Gao
nvmet_pci_epf_create_cq()callsnvmet_cq_create(), which takes a reference on the controller and installs the completion queue. If the subsequent PCI address-space mapping fails or returns a too-small partial mapping, the function jumps toerr_internal/err_unmap_queuewithout callingnvmet_cq_put(). The matching put innvmet_pci_epf_delete_cq()is gated onNVMET_PCI_EPF_Q_LIVE, which is only set after the mapping succeeds, so teardown never releases these references. A remote PCI host that drives Create IO CQ commands with a failing PRP1/pci_addr therefore leaks the CQ and a controller reference on each attempt.
Quoted 3 lines
Drop the CQ reference on the mapping-failure paths. The
err_internalanderr_unmap_queuelabels are only reachable afternvmet_cq_create()has succeeded, so this pairs the create/put correctly.
Thanks, applied to nvme-7.3.