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 A1984217F55; Tue, 30 Sep 2025 15:05:49 +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=1759244749; cv=none; b=Eqq4teW8dcD38fFYUpDAq3YHcK2wFtli6wRq064B7TQit/BcUR1VWTq5g1Ijs/e100thhWJCshO60zQD9BcFg+rZDTU9+tEIinofIQDRQpgAAf5zqbqph5szZNPt4ERjKt4ZV48iMzYaVv2TUQIXrxjWOLfewSR/sBMiNYf4loI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759244749; c=relaxed/simple; bh=J9EJz9jSrpOp5ed913/EwKFMTo3cycbzYeXFUJH5tnE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d258jOxozqqB02lyo+Yjo6gmPDS2iuIPq4qif0jOLnJlUUwvMYitpL+M/RIQgFXYVfCrokqvKS0UahjDr/xHPtBznrvUsQh6UXzYkVzuJaXfBbFX7Z6qhsMHZzpMQKB1EAgkiRPOq2fysKmJ7MkpE+hz1vLRr/6iPtHdsv7Y0qc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=P2S8tcJk; 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="P2S8tcJk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14C52C4CEF0; Tue, 30 Sep 2025 15:05:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1759244749; bh=J9EJz9jSrpOp5ed913/EwKFMTo3cycbzYeXFUJH5tnE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P2S8tcJk29hSHjMZbOWyPdJwLL1LrXuy2YV+eJ8n6XT6hAgT29Vglgceek9HNk5vV NrCwjNsR+ohS1rv56z6xRCT990vRORGu1921ycmu6R9nwjJoUegFqRLyx0qpiLQqKQ t3WAnNaylogE0AZ4KHH4ANdFMkgrRHwIW5AKjoJE= 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.16 103/143] i40e: fix idx validation in i40e_validate_queue_map Date: Tue, 30 Sep 2025 16:47:07 +0200 Message-ID: <20250930143835.333787166@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930143831.236060637@linuxfoundation.org> References: <20250930143831.236060637@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.16-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;