i40e: fix idx validation in i40e_validate_queue_map

Ensure idx is within range of active/initialized TCs when iterating over
vf->ch[idx] in i40e_validate_queue_map().

Fixes: c27eac48160d ("i40e: Enable ADq and create queue channel/s on VF")
Cc: stable@vger.kernel.org
Signed-off-by: Lukasz Czapnik <lukasz.czapnik@intel.com>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Kamakshi Nellore <nellorex.kamakshi@intel.com> (A Contingent Worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index cb37b2ac56f132392636a7003b473fa845f65ec5..1c4f86221255ec997b015b4a4fb9628a087296e4 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -2466,8 +2466,10 @@ static int i40e_validate_queue_map(struct i40e_vf *vf, u16 vsi_id,
        u16 vsi_queue_id, queue_id;
 
        for_each_set_bit(vsi_queue_id, &queuemap, I40E_MAX_VSI_QP) {
-               if (vf->adq_enabled) {
-                       vsi_id = vf->ch[vsi_queue_id / I40E_MAX_VF_VSI].vsi_id;
+               u16 idx = vsi_queue_id / I40E_MAX_VF_VSI;
+
+               if (vf->adq_enabled && idx < vf->num_tc) {
+                       vsi_id = vf->ch[idx].vsi_id;
                        queue_id = (vsi_queue_id % I40E_DEFAULT_QUEUES_PER_VF);
                } else {
                        queue_id = vsi_queue_id;