ice: fix the divide by zero issue
authorKiran Patil <kiran.patil@intel.com>
Wed, 27 Feb 2019 00:35:10 +0000 (16:35 -0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Fri, 22 Mar 2019 15:19:17 +0000 (08:19 -0700)
Static analysis flagged a potential divide by zero error because
vsi->num_rxq can become zero in certain condition and it is used as
divisor.

Signed-off-by: Kiran Patil <kiran.patil@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ice/ice_lib.c

index a602bd3..5d364b7 100644 (file)
@@ -881,7 +881,18 @@ static void ice_vsi_setup_q_map(struct ice_vsi *vsi, struct ice_vsi_ctx *ctxt)
                tx_count += tx_numq_tc;
                ctxt->info.tc_mapping[i] = cpu_to_le16(qmap);
        }
-       vsi->num_rxq = offset;
+
+       /* if offset is non-zero, means it is calculated correctly based on
+        * enabled TCs for a given VSI otherwise qcount_rx will always
+        * be correct and non-zero because it is based off - VSI's
+        * allocated Rx queues which is at least 1 (hence qcount_tx will be
+        * at least 1)
+        */
+       if (offset)
+               vsi->num_rxq = offset;
+       else
+               vsi->num_rxq = qcount_rx;
+
        vsi->num_txq = tx_count;
 
        if (vsi->type == ICE_VSI_VF && vsi->num_txq != vsi->num_rxq) {