Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5a2b3ff authored by Piotr Kwapulinski's avatar Piotr Kwapulinski Committed by Jeff Kirsher
Browse files

i40e: Add bounds check for ch[] array 



Add bounds check for ch[] array.
Use ARRAY_SIZE() to ensure that idx is within the range.

Signed-off-by: default avatarPiotr Kwapulinski <piotr.kwapulinski@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 97e42ef4

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

+10 −1
Original line number Diff line number Diff line
@@ -2135,8 +2135,13 @@ static int i40e_vc_config_queues_msg(struct i40e_vf *vf, u8 *msg) 
			}

		}



		if (vf->adq_enabled)

		if (vf->adq_enabled) {

			if (idx >= ARRAY_SIZE(vf->ch)) {

				aq_ret = I40E_ERR_NO_AVAILABLE_VSI;

				goto error_param;

			}

			vsi_id = vf->ch[idx].vsi_id;

		}



		if (i40e_config_vsi_rx_queue(vf, vsi_id, vsi_queue_id,

					     &qpi->rxq) ||
@@ -2152,6 +2157,10 @@ static int i40e_vc_config_queues_msg(struct i40e_vf *vf, u8 *msg) 
		 * to its appropriate VSIs based on TC mapping

		 **/

		if (vf->adq_enabled) {

			if (idx >= ARRAY_SIZE(vf->ch)) {

				aq_ret = I40E_ERR_NO_AVAILABLE_VSI;

				goto error_param;

			}

			if (j == (vf->ch[idx].num_qps - 1)) {

				idx++;

				j = 0; /* resetting the queue count */