From: Douglas Miller Date: Fri, 4 Mar 2016 21:36:56 +0000 (-0600) Subject: be2net: Don't leak iomapped memory on removal. X-Git-Tag: v4.1.12-92~119^2~44 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5f3c510a6f635a8301c135a41cd75a9fd8ae1fc1;p=users%2Fjedix%2Flinux-maple.git be2net: Don't leak iomapped memory on removal. The adapter->pcicfg resource is either mapped via pci_iomap() or derived from adapter->db. During be_remove() this resource was ignored and so could remain mapped after remove. Add a flag to track whether adapter->pcicfg was mapped or not, then use that flag in be_unmap_pci_bars() to unmap if required. Fixes: 25848c901 ("use PCI MMIO read instead of config read for errors") Signed-off-by: Douglas Miller Signed-off-by: David S. Miller Signed-off-by: suresh.reddy Orabug: 23641442 Signed-off-by: Manjunath Govindashetty --- diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h index 21bf8b559ed28..ecffa3d764078 100644 --- a/drivers/net/ethernet/emulex/benet/be.h +++ b/drivers/net/ethernet/emulex/benet/be.h @@ -546,6 +546,7 @@ struct be_adapter { u8 recovery_retries; u8 err_flags; u32 flags; + bool pcicfg_mapped; /* pcicfg obtained via pci_iomap() */ u32 cmd_privileges; /* Ethtool knobs and info */ char fw_ver[FW_VER_LEN]; diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 29d57ecbc5486..6622792c8f778 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -5046,6 +5046,8 @@ static void be_unmap_pci_bars(struct be_adapter *adapter) pci_iounmap(adapter->pdev, adapter->csr); if (adapter->db) pci_iounmap(adapter->pdev, adapter->db); + if (adapter->pcicfg && adapter->pcicfg_mapped) + pci_iounmap(adapter->pdev, adapter->pcicfg); } static int db_bar(struct be_adapter *adapter) @@ -5097,8 +5099,10 @@ static int be_map_pci_bars(struct be_adapter *adapter) if (!addr) goto pci_map_err; adapter->pcicfg = addr; + adapter->pcicfg_mapped = true; } else { adapter->pcicfg = adapter->db + SRIOV_VF_PCICFG_OFFSET; + adapter->pcicfg_mapped = false; } }