From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1DFB3537E9; Tue, 30 Sep 2025 15:30:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759246221; cv=none; b=opmZEa1b7vihpq4nk+IP+pYkWs2Fsthx8vSprLXaNp/98vIS9bvYlZeEXqVwi68Zyihp5e7o0eqX65UCu/Ytz1Ex7lqaoNk6SbZddSRz/lUgJS27q3cwZ//JH+qY2dicYXgNXOuvhol7zc9XoetTKhdVm6lg+/baHWtm0XG1aoo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759246221; c=relaxed/simple; bh=sHqRjCJItGs4j1lHgqZaVrcafl8kWhsyzLupJVoLlbc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MTqEj716b1KOmEILIZ3eqHX5PXP6AxnGOlfj+MTcEor+Mnc5pOJih40AstoyBLMDQd+k2XhxKJJcbQCH5D/se7Qyqn6c0Xp9oxbOpFPPHHuv7DQO3tJhuO3aCRewjU34Tyop9K8/JZ37lq0erQmBvyJzeCj8WNKNghQ5Vyn5IBE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=O8mAUIe3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="O8mAUIe3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99F37C4CEF0; Tue, 30 Sep 2025 15:30:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1759246221; bh=sHqRjCJItGs4j1lHgqZaVrcafl8kWhsyzLupJVoLlbc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O8mAUIe3ha0uEIrTpiCIgjU9coaRx2xWc9w/PBbYXnX4ANNbCO3ii35tOHBEfPTBt 4dcqny8ZHYF1WuoRwsXBNbFKG5c4FT9y/KwXW9Yhsh7QhNSMDuMxZ82mYZVm/HFA++ qOYM67wL9PuUax3LoEexygXo0Emm7mP0aX9GU9uQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lukasz Czapnik , Aleksandr Loktionov , Przemek Kitszel , Simon Horman , Tony Nguyen , Kamakshi Nellore Subject: [PATCH 6.12 68/89] i40e: fix idx validation in i40e_validate_queue_map Date: Tue, 30 Sep 2025 16:48:22 +0200 Message-ID: <20250930143824.719138407@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930143821.852512002@linuxfoundation.org> References: <20250930143821.852512002@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lukasz Czapnik commit aa68d3c3ac8d1dcec40d52ae27e39f6d32207009 upstream. 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 Reviewed-by: Aleksandr Loktionov Signed-off-by: Przemek Kitszel Reviewed-by: Simon Horman Tested-by: Kamakshi Nellore (A Contingent Worker at Intel) Signed-off-by: Tony Nguyen Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c @@ -2469,8 +2469,10 @@ static int i40e_validate_queue_map(struc 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;