[Intel-wired-lan] [iwl-net 3/4] ice: validate queue quanta parameters to prevent OOB access

[Martyna Szapar-Mudlaw]

From: Jan Glaza <jan.gl...@intel.com>

Add queue wraparound prevention in quanta configuration.
Ensure end_qid does not overflow by validating start_qid and num_queues.

Fixes: 015307754a19 ("ice: Support VF queue rate limit and quanta size 
configuration")
Reviewed-by: Jedrzej Jagielski <jedrzej.jagiel...@intel.com>
Signed-off-by: Jan Glaza <jan.gl...@intel.com>
Signed-off-by: Martyna Szapar-Mudlaw <martyna.szapar-mud...@linux.intel.com>
---
 drivers/net/ethernet/intel/ice/ice_virtchnl.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.c 
b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
index 343f2b4b0dc5..adb1bf12542f 100644
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
@@ -1903,13 +1903,21 @@ static int ice_vc_cfg_q_bw(struct ice_vf *vf, u8 *msg)
  */
 static int ice_vc_cfg_q_quanta(struct ice_vf *vf, u8 *msg)
 {
+       u16 quanta_prof_id, quanta_size, start_qid, num_queues, end_qid, i;
        enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;
-       u16 quanta_prof_id, quanta_size, start_qid, end_qid, i;
        struct virtchnl_quanta_cfg *qquanta =
                (struct virtchnl_quanta_cfg *)msg;
        struct ice_vsi *vsi;
        int ret;
 
+       start_qid = qquanta->queue_select.start_queue_id;
+       num_queues = qquanta->queue_select.num_queues;
+
+       if (check_add_overflow(start_qid, num_queues, &end_qid)) {
+               v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+               goto err;
+       }
+
        if (!test_bit(ICE_VF_STATE_ACTIVE, vf->vf_states)) {
                v_ret = VIRTCHNL_STATUS_ERR_PARAM;
                goto err;
@@ -1921,8 +1929,6 @@ static int ice_vc_cfg_q_quanta(struct ice_vf *vf, u8 *msg)
                goto err;
        }
 
-       end_qid = qquanta->queue_select.start_queue_id +
-                 qquanta->queue_select.num_queues;
        if (end_qid > ICE_MAX_RSS_QS_PER_VF ||
            end_qid > min_t(u16, vsi->alloc_txq, vsi->alloc_rxq)) {
                dev_err(ice_pf_to_dev(vf->pf), "VF-%d trying to configure more 
than allocated number of queues: %d\n",
@@ -1951,7 +1957,6 @@ static int ice_vc_cfg_q_quanta(struct ice_vf *vf, u8 *msg)
                goto err;
        }
 
-       start_qid = qquanta->queue_select.start_queue_id;
        for (i = start_qid; i < end_qid; i++)
                vsi->tx_rings[i]->quanta_prof_id = quanta_prof_id;
 
-- 
2.47.0