bnxt_en: Fix ethtool -x crash when device is down.

Fix ethtool .get_rxfh() crash by checking for valid indirection table
address before copying the data.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 8d8ccd67e0e27a58b7b1fde4f61dd0765d4b455f..1f622ca2a64f4d2e82557df6efdf87e9c4778df4 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -870,17 +870,22 @@ static int bnxt_get_rxfh(struct net_device *dev, u32 *indir, u8 *key,
                         u8 *hfunc)
 {
        struct bnxt *bp = netdev_priv(dev);
-       struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
+       struct bnxt_vnic_info *vnic;
        int i = 0;
 
        if (hfunc)
                *hfunc = ETH_RSS_HASH_TOP;
 
-       if (indir)
+       if (!bp->vnic_info)
+               return 0;
+
+       vnic = &bp->vnic_info[0];
+       if (indir && vnic->rss_table) {
                for (i = 0; i < HW_HASH_INDEX_SIZE; i++)
                        indir[i] = le16_to_cpu(vnic->rss_table[i]);
+       }
 
-       if (key)
+       if (key && vnic->rss_hash_key)
                memcpy(key, vnic->rss_hash_key, HW_HASH_KEY_SIZE);
 
        return 0;