Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a69bf3c5 authored by Douglas Miller's avatar Douglas Miller Committed by David S. Miller
Browse files

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: 25848c90 ("use PCI MMIO read instead of config read for errors")

Signed-off-by: default avatarDouglas Miller <dougmill@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cec05562

drivers/net/ethernet/emulex/benet/be.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -531,6 +531,7 @@ struct be_adapter { 




	struct delayed_work be_err_detection_work;

	struct delayed_work be_err_detection_work;

	u8 err_flags;

	u8 err_flags;

	bool pcicfg_mapped;	/* pcicfg obtained via pci_iomap() */

	u32 flags;

	u32 flags;

	u32 cmd_privileges;

	u32 cmd_privileges;

	/* Ethtool knobs and info */

	/* Ethtool knobs and info */

drivers/net/ethernet/emulex/benet/be_main.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -4970,6 +4970,8 @@ static void be_unmap_pci_bars(struct be_adapter *adapter) 
		pci_iounmap(adapter->pdev, adapter->csr);

		pci_iounmap(adapter->pdev, adapter->csr);

	if (adapter->db)

	if (adapter->db)

		pci_iounmap(adapter->pdev, 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)

static int db_bar(struct be_adapter *adapter)
@@ -5021,8 +5023,10 @@ static int be_map_pci_bars(struct be_adapter *adapter) 
			if (!addr)

			if (!addr)

				goto pci_map_err;

				goto pci_map_err;

			adapter->pcicfg = addr;

			adapter->pcicfg = addr;

			adapter->pcicfg_mapped = true;

		} else {

		} else {

			adapter->pcicfg = adapter->db + SRIOV_VF_PCICFG_OFFSET;

			adapter->pcicfg = adapter->db + SRIOV_VF_PCICFG_OFFSET;

			adapter->pcicfg_mapped = false;

		}

		}

	}

	}