summaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@cardoe.com>2015-11-26 14:32:39 -0600
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2015-12-18 11:38:48 -0500
commit584a561a6fee0d258f9ca644f58b73d9a41b8a46 (patch)
treed4882559fa179adcfb71ffebf0e2158fabb6cbd1 /drivers/xen
parent408fb0e5aa7fda0059db282ff58c3b2a4278baa0 (diff)
downloadop-kernel-dev-584a561a6fee0d258f9ca644f58b73d9a41b8a46.zip
op-kernel-dev-584a561a6fee0d258f9ca644f58b73d9a41b8a46.tar.gz
xen-pciback: fix up cleanup path when alloc fails
When allocating a pciback device fails, clear the private field. This could lead to an use-after free, however the 'really_probe' takes care of setting dev_set_drvdata(dev, NULL) in its failure path (which we would exercise if the ->probe function failed), so we we are OK. However lets be defensive as the code can change. Going forward we should clean up the pci_set_drvdata(dev, NULL) in the various code-base. That will be for another day. Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Reported-by: Jonathan Creekmore <jonathan.creekmore@gmail.com> Signed-off-by: Doug Goldstein <cardoe@cardoe.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/xen-pciback/xenbus.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/xen/xen-pciback/xenbus.c b/drivers/xen/xen-pciback/xenbus.c
index 98bc345..4843741 100644
--- a/drivers/xen/xen-pciback/xenbus.c
+++ b/drivers/xen/xen-pciback/xenbus.c
@@ -44,7 +44,6 @@ static struct xen_pcibk_device *alloc_pdev(struct xenbus_device *xdev)
dev_dbg(&xdev->dev, "allocated pdev @ 0x%p\n", pdev);
pdev->xdev = xdev;
- dev_set_drvdata(&xdev->dev, pdev);
mutex_init(&pdev->dev_lock);
@@ -58,6 +57,9 @@ static struct xen_pcibk_device *alloc_pdev(struct xenbus_device *xdev)
kfree(pdev);
pdev = NULL;
}
+
+ dev_set_drvdata(&xdev->dev, pdev);
+
out:
return pdev;
}
OpenPOWER on IntegriCloud