On Tue, Jul 12, 2016 at 11:31:24AM -0400, Cathy Avery wrote: > SR-IOV disabled from the host causes a memory leak. > pci-hyperv usually first receives a PCI_EJECT notification > and then proceeds to delete the hpdev list entry in > hv_eject_device_work(). Later in hv_msi_free() since the > device is no longer on the device list hpdev is NULL > and hv_msi_free returns without freeing int_desc as part of > hv_int_desc_free(). > > Signed-off-by: Cathy Avery <cavery@xxxxxxxxxx> Applied with Jake's ack to pci/host-hv for v4.8, thanks! For some reason, Jake's ack appears in patchwork and in my personal email, but I don't see it on the mailing list. Maybe something in http://vger.kernel.org/majordomo-info.html#taboo is relevant. > --- > drivers/pci/host/pci-hyperv.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c > index 7e9b2de..449d053 100644 > --- a/drivers/pci/host/pci-hyperv.c > +++ b/drivers/pci/host/pci-hyperv.c > @@ -732,16 +732,18 @@ static void hv_msi_free(struct irq_domain *domain, struct msi_domain_info *info, > > pdev = msi_desc_to_pci_dev(msi); > hbus = info->data; > - hpdev = get_pcichild_wslot(hbus, devfn_to_wslot(pdev->devfn)); > - if (!hpdev) > + int_desc = irq_data_get_irq_chip_data(irq_data); > + if (!int_desc) > return; > > - int_desc = irq_data_get_irq_chip_data(irq_data); > - if (int_desc) { > - irq_data->chip_data = NULL; > - hv_int_desc_free(hpdev, int_desc); > + irq_data->chip_data = NULL; > + hpdev = get_pcichild_wslot(hbus, devfn_to_wslot(pdev->devfn)); > + if (!hpdev) { > + kfree(int_desc); > + return; > } > > + hv_int_desc_free(hpdev, int_desc); > put_pcichild(hpdev, hv_pcidev_ref_by_slot); > } > > -- > 2.5.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
