diff options
| author | Nikolay Aleksandrov | 2012-09-14 07:50:03 +0200 |
|---|---|---|
| committer | David S. Miller | 2012-09-18 22:22:08 +0200 |
| commit | e4d1aa40e363ed3e0486aeeeb0d173f7f822737e (patch) | |
| tree | 8b787165d2d0eb6514033afe925f308a98cea920 | |
| parent | bnx2x: fix rx checksum validation for IPv6 (diff) | |
| download | kernel-qcow2-linux-e4d1aa40e363ed3e0486aeeeb0d173f7f822737e.tar.gz kernel-qcow2-linux-e4d1aa40e363ed3e0486aeeeb0d173f7f822737e.tar.xz kernel-qcow2-linux-e4d1aa40e363ed3e0486aeeeb0d173f7f822737e.zip | |
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>
| -rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index 342b3a79bd0f..a77c558d8f40 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c @@ -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; |