xen/pciback: Check dev_data before using it
authorRoss Lagerwall <ross.lagerwall@citrix.com>
Fri, 14 Dec 2018 12:55:45 +0000 (12:55 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2019 14:37:27 +0000 (15:37 +0100)
[ Upstream commit 1669907e3d1abfa3f7586e2d55dbbc117b5adba2 ]

If pcistub_init_device fails, the release function will be called with
dev_data set to NULL.  Check it before using it to avoid a NULL pointer
dereference.

Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/xen/xen-pciback/pci_stub.c

index 9e480fdebe1f059419e8864c473e3c6ee2f02cb4..8c250f4a3a97a7c4402e665045adc21b47ac9eb3 100644 (file)
@@ -106,7 +106,8 @@ static void pcistub_device_release(struct kref *kref)
         * is called from "unbind" which takes a device_lock mutex.
         */
        __pci_reset_function_locked(dev);
-       if (pci_load_and_free_saved_state(dev, &dev_data->pci_saved_state))
+       if (dev_data &&
+           pci_load_and_free_saved_state(dev, &dev_data->pci_saved_state))
                dev_info(&dev->dev, "Could not reload PCI state\n");
        else
                pci_restore_state(dev);