]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
i40e: add validation for ring_len param
authorLukasz Czapnik <lukasz.czapnik@intel.com>
Mon, 29 Sep 2025 14:45:59 +0000 (10:45 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 2 Oct 2025 11:35:47 +0000 (13:35 +0200)
[ Upstream commit 55d225670def06b01af2e7a5e0446fbe946289e8 ]

The `ring_len` parameter provided by the virtual function (VF)
is assigned directly to the hardware memory context (HMC) without
any validation.

To address this, introduce an upper boundary check for both Tx and Rx
queue lengths. The maximum number of descriptors supported by the
hardware is 8k-32.
Additionally, enforce alignment constraints: Tx rings must be a multiple
of 8, and Rx rings must be a multiple of 32.

Fixes: 5c3c48ac6bf5 ("i40e: implement virtual device interface")
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: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

index 57cf7e7f3045074f2d99aa09d795bbe9ff216109..ae0e69ccd028a72d25324e0b3b45fe395c2fcba5 100644 (file)
@@ -600,6 +600,13 @@ static int i40e_config_vsi_tx_queue(struct i40e_vf *vf, u16 vsi_id,
 
        /* only set the required fields */
        tx_ctx.base = info->dma_ring_addr / 128;
+
+       /* ring_len has to be multiple of 8 */
+       if (!IS_ALIGNED(info->ring_len, 8) ||
+           info->ring_len > I40E_MAX_NUM_DESCRIPTORS_XL710) {
+               ret = -EINVAL;
+               goto error_context;
+       }
        tx_ctx.qlen = info->ring_len;
        tx_ctx.rdylist = le16_to_cpu(vsi->info.qs_handle[0]);
        tx_ctx.rdylist_act = 0;
@@ -665,6 +672,13 @@ static int i40e_config_vsi_rx_queue(struct i40e_vf *vf, u16 vsi_id,
 
        /* only set the required fields */
        rx_ctx.base = info->dma_ring_addr / 128;
+
+       /* ring_len has to be multiple of 32 */
+       if (!IS_ALIGNED(info->ring_len, 32) ||
+           info->ring_len > I40E_MAX_NUM_DESCRIPTORS_XL710) {
+               ret = -EINVAL;
+               goto error_param;
+       }
        rx_ctx.qlen = info->ring_len;
 
        if (info->splithdr_enabled) {