Skip to content

Commit 34dfac0

Browse files
lczapnikgregkh
authored andcommitted
i40e: fix idx validation in i40e_validate_queue_map
commit aa68d3c upstream. Ensure idx is within range of active/initialized TCs when iterating over vf->ch[idx] in i40e_validate_queue_map(). Fixes: c27eac4 ("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent d382d6d commit 34dfac0

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2457,8 +2457,10 @@ static int i40e_validate_queue_map(struct i40e_vf *vf, u16 vsi_id,
24572457
u16 vsi_queue_id, queue_id;
24582458

24592459
for_each_set_bit(vsi_queue_id, &queuemap, I40E_MAX_VSI_QP) {
2460-
if (vf->adq_enabled) {
2461-
vsi_id = vf->ch[vsi_queue_id / I40E_MAX_VF_VSI].vsi_id;
2460+
u16 idx = vsi_queue_id / I40E_MAX_VF_VSI;
2461+
2462+
if (vf->adq_enabled && idx < vf->num_tc) {
2463+
vsi_id = vf->ch[idx].vsi_id;
24622464
queue_id = (vsi_queue_id % I40E_DEFAULT_QUEUES_PER_VF);
24632465
} else {
24642466
queue_id = vsi_queue_id;

0 commit comments

Comments
 (0)