Commit e4d1aa40 authored Sep 14, 2012 by Nikolay Aleksandrov Committed by David S. Miller Sep 18, 2012

netxen: check for root bus in netxen_mask_aer_correctable



Add a check if pdev->bus->self == NULL (root bus). When attaching
a netxen NIC to a VM it can be on the root bus and the guest would
crash in netxen_mask_aer_correctable() because of a NULL pointer
dereference if CONFIG_PCIEAER is present.

Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e488921f

drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1378,6 +1378,10 @@ static void netxen_mask_aer_correctable(struct netxen_adapter *adapter)
		struct pci_dev *root = pdev->bus->self;
		u32 aer_pos;

		/* root bus? */
		if (!root)
		return;

		if (adapter->ahw.board_type != NETXEN_BRDTYPE_P3_4_GB_MM &&
		adapter->ahw.board_type != NETXEN_BRDTYPE_P3_10G_TP)
		return;

Admin message