aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Nemov <sergey.nemov@intel.com>2020-08-07 13:55:14 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-11 15:32:35 +0200
commit43a7e1cf606e96ee43f8897129972f0b79390367 (patch)
treeff6efc21d39e35facac77b590b303c1db089a843
parent46a41ed2e6f3cb7bb193126bae357c2c6bf2ee4f (diff)
downloadlinux-yocto-43a7e1cf606e96ee43f8897129972f0b79390367.tar.gz
linux-yocto-43a7e1cf606e96ee43f8897129972f0b79390367.tar.bz2
linux-yocto-43a7e1cf606e96ee43f8897129972f0b79390367.zip
i40e: add num_vectors checker in iwarp handler
[ Upstream commit 7015ca3df965378bcef072cca9cd63ed098665b5 ] Field num_vectors from struct virtchnl_iwarp_qvlist_info should not be larger than num_msix_vectors_vf in the hw struct. The iwarp uses the same set of vectors as the LAN VF driver. Fixes: e3219ce6a7754 ("i40e: Add support for client interface for IWARP driver") Signed-off-by: Sergey Nemov <sergey.nemov@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 6a677fd540d6..a1b464a91d93 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -442,6 +442,16 @@ static int i40e_config_iwarp_qvlist(struct i40e_vf *vf,
u32 next_q_idx, next_q_type;
u32 msix_vf, size;
+ msix_vf = pf->hw.func_caps.num_msix_vectors_vf;
+
+ if (qvlist_info->num_vectors > msix_vf) {
+ dev_warn(&pf->pdev->dev,
+ "Incorrect number of iwarp vectors %u. Maximum %u allowed.\n",
+ qvlist_info->num_vectors,
+ msix_vf);
+ goto err;
+ }
+
size = sizeof(struct virtchnl_iwarp_qvlist_info) +
(sizeof(struct virtchnl_iwarp_qv_info) *
(qvlist_info->num_vectors - 1));