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

Commit 80f513b5 authored by Keith Busch's avatar Keith Busch
Browse files

nvme/pci: Hold controller reference during async probe 



It is possible the driver's remove may have freed the controller if
the remove callback is invoked prior to the async_schedule starting
the reset_work. This patch fixes that by holding a reference on the
controller.

Reported-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
parent 3831761e

drivers/nvme/host/pci.c

+3 −0
Original line number Diff line number Diff line
@@ -2492,8 +2492,10 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev) 
static void nvme_async_probe(void *data, async_cookie_t cookie)

{

	struct nvme_dev *dev = data;



	nvme_reset_ctrl_sync(&dev->ctrl);

	flush_work(&dev->ctrl.scan_work);

	nvme_put_ctrl(&dev->ctrl);

}



static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
@@ -2540,6 +2542,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	dev_info(dev->ctrl.device, "pci function %s\n", dev_name(&pdev->dev));



	nvme_get_ctrl(&dev->ctrl);

	async_schedule(nvme_async_probe, dev);



	return 0;