enic: fix crash when allocating too many queues
authorNelson Escobar <neescoba@cisco.com>
Thu, 17 Mar 2016 22:49:58 +0000 (15:49 -0700)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Fri, 25 Mar 2016 17:56:44 +0000 (18:56 +0100)
Add checks to make sure we don't try to allocate more tx or rx queues
than we support.

Fixes: fefed3d1e62c ("enic: new driver")

Signed-off-by: Nelson Escobar <neescoba@cisco.com>
Reviewed-by: John Daley <johndale@cisco.com>
drivers/net/enic/enic_ethdev.c

index bab0f7d..4969476 100644 (file)
@@ -174,6 +174,13 @@ static int enicpmd_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,
        struct enic *enic = pmd_priv(eth_dev);
 
        ENICPMD_FUNC_TRACE();
+       if (queue_idx >= ENIC_WQ_MAX) {
+               dev_err(enic,
+                       "Max number of TX queues exceeded.  Max is %d\n",
+                       ENIC_WQ_MAX);
+               return -EINVAL;
+       }
+
        eth_dev->data->tx_queues[queue_idx] = (void *)&enic->wq[queue_idx];
 
        ret = enic_alloc_wq(enic, queue_idx, socket_id, nb_desc);
@@ -262,6 +269,13 @@ static int enicpmd_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
        struct enic *enic = pmd_priv(eth_dev);
 
        ENICPMD_FUNC_TRACE();
+       if (queue_idx >= ENIC_RQ_MAX) {
+               dev_err(enic,
+                       "Max number of RX queues exceeded.  Max is %d\n",
+                       ENIC_RQ_MAX);
+               return -EINVAL;
+       }
+
        eth_dev->data->rx_queues[queue_idx] = (void *)&enic->rq[queue_idx];
 
        ret = enic_alloc_rq(enic, queue_idx, socket_id, mp, nb_desc);