]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
cxgb4: fix a NULL dereference
authorGanesh Goudar <ganeshgr@chelsio.com>
Fri, 16 Jun 2017 10:06:09 +0000 (15:36 +0530)
committerDavid S. Miller <davem@davemloft.net>
Mon, 19 Jun 2017 04:02:25 +0000 (00:02 -0400)
Avoid NULL dereference in setup_sge_queues() when the adapter is
in non offload mode.

Fixes: 0fbc81b3ad51 ('chcr/cxgb4i/cxgbit/RDMA/cxgb4: Allocate resources dynamically for all cxgb4 ULD's')
Signed-off-by: Ganesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

index 15fb284eafc0140df630044c572589d83f762b41..257ac18dc22bcb612d84b606862343006089ae59 100644 (file)
@@ -824,9 +824,12 @@ static int setup_sge_queues(struct adapter *adap)
 {
        int err, i, j;
        struct sge *s = &adap->sge;
-       struct sge_uld_rxq_info *rxq_info = s->uld_rxq_info[CXGB4_ULD_RDMA];
+       struct sge_uld_rxq_info *rxq_info = NULL;
        unsigned int cmplqid = 0;
 
+       if (is_uld(adap))
+               rxq_info = s->uld_rxq_info[CXGB4_ULD_RDMA];
+
        for_each_port(adap, i) {
                struct net_device *dev = adap->port[i];
                struct port_info *pi = netdev_priv(dev);