lkml.org 
[lkml]   [2012]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 038/133] netxen: check for root bus in netxen_mask_aer_correctable
    Date
    3.5-stable review patch.  If anyone has any objections, please let me know.

    ------------------


    From: Nikolay Aleksandrov <nikolay@redhat.com>

    [ Upstream commit e4d1aa40e363ed3e0486aeeeb0d173f7f822737e ]

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 ++++
    1 file changed, 4 insertions(+)

    --- 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 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;



    \
     
     \ /
      Last update: 2012-10-11 02:02    [W:4.224 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site