| From 649c49e69d71e187af30b09da258ed9778d2ab47 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Tue, 1 Nov 2016 16:26:03 +0100 |
| Subject: [PATCH] powerpc/pci/rpadlpar: Fix device reference leaks |
| |
| commit 99e5cde5eae78bef95bfe7c16ccda87fb070149b upstream. |
| |
| Make sure to drop any device reference taken by vio_find_node() when |
| adding and removing virtual I/O slots. |
| |
| Fixes: 5eeb8c63a38f ("[PATCH] PCI Hotplug: rpaphp: Move VIO registration") |
| Signed-off-by: Johan Hovold <johan@kernel.org> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c |
| index dc67f39779ec..c614ff7c3bc3 100644 |
| --- a/drivers/pci/hotplug/rpadlpar_core.c |
| +++ b/drivers/pci/hotplug/rpadlpar_core.c |
| @@ -257,8 +257,13 @@ static int dlpar_add_phb(char *drc_name, struct device_node *dn) |
| |
| static int dlpar_add_vio_slot(char *drc_name, struct device_node *dn) |
| { |
| - if (vio_find_node(dn)) |
| + struct vio_dev *vio_dev; |
| + |
| + vio_dev = vio_find_node(dn); |
| + if (vio_dev) { |
| + put_device(&vio_dev->dev); |
| return -EINVAL; |
| + } |
| |
| if (!vio_register_device_node(dn)) { |
| printk(KERN_ERR |
| @@ -334,6 +339,9 @@ static int dlpar_remove_vio_slot(char *drc_name, struct device_node *dn) |
| return -EINVAL; |
| |
| vio_unregister_device(vio_dev); |
| + |
| + put_device(&vio_dev->dev); |
| + |
| return 0; |
| } |
| |
| -- |
| 2.10.1 |
| |