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 1C10D374C4; Tue, 8 Apr 2025 11:14:39 +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=1744110879; cv=none; b=Hr1v+KqGo8Hy4bbutr8JmFIbMhMogROskQmTPFyNlskg01AH8gwJtrpakz4jc8spVffeRRhFNzNg8mCQ5ry2bExftYwir/PPe46StW+OVhdKqH42y8tgCR4UVyYXMgqix7mQm4WSJa8k/wJ/dSbOdw3fr+U8MWUbp9wJALIupsk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744110879; c=relaxed/simple; bh=wk/xtwginFcXnG40EUV6/2zXeIE+dp1qMXK9ycDwmDk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZTnPSUYYXjx1M7l4JUe5nevB9QislVMcsZW9sqR2+jjcFVciM9aV0qdJoDot0XnmB83M0eo9Vdbj3t8WwSG7rKaPaeSqDe/hK5PXq3IT5epKo/dK8/giF4w/jJK9yVxklpEArt+97C7p44ulac89SZljFxgV3K2w7b6wMWgKpps= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=N5j7y2Fh; 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="N5j7y2Fh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C8C8C4CEE5; Tue, 8 Apr 2025 11:14:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744110879; bh=wk/xtwginFcXnG40EUV6/2zXeIE+dp1qMXK9ycDwmDk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N5j7y2FhaIxNaSh4VHtCzZQcHyP1jtzL/8wouqD5rXtn08slXUtwpvqOibZwywnKC 4VH/wWeOcNYjqZki9qsvrmsoYXhh5NU4id7mfZRXXTVjoPjKC5271TwrudZGhBQFAe zqVQMuvIEPsbS0AqOO2HhC+QzjbPtkrmy7qY9v00= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jedrzej Jagielski , Simon Horman , Jan Glaza , Martyna Szapar-Mudlaw , Rafal Romanowski , Tony Nguyen , Sasha Levin Subject: [PATCH 6.14 211/731] ice: validate queue quanta parameters to prevent OOB access Date: Tue, 8 Apr 2025 12:41:48 +0200 Message-ID: <20250408104919.190168856@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104914.247897328@linuxfoundation.org> References: <20250408104914.247897328@linuxfoundation.org> User-Agent: quilt/0.68 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.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jan Glaza [ Upstream commit e2f7d3f7331b92cb820da23e8c45133305da1e63 ] Add queue wraparound prevention in quanta configuration. Ensure end_qid does not overflow by validating start_qid and num_queues. Fixes: 015307754a19 ("ice: Support VF queue rate limit and quanta size configuration") Reviewed-by: Jedrzej Jagielski Reviewed-by: Simon Horman Signed-off-by: Jan Glaza Signed-off-by: Martyna Szapar-Mudlaw Tested-by: Rafal Romanowski Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_virtchnl.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.c b/drivers/net/ethernet/intel/ice/ice_virtchnl.c index 346aee373ccd4..df13f5110168d 100644 --- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c @@ -1900,13 +1900,21 @@ static int ice_vc_cfg_q_bw(struct ice_vf *vf, u8 *msg) */ static int ice_vc_cfg_q_quanta(struct ice_vf *vf, u8 *msg) { + u16 quanta_prof_id, quanta_size, start_qid, num_queues, end_qid, i; enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS; - u16 quanta_prof_id, quanta_size, start_qid, end_qid, i; struct virtchnl_quanta_cfg *qquanta = (struct virtchnl_quanta_cfg *)msg; struct ice_vsi *vsi; int ret; + start_qid = qquanta->queue_select.start_queue_id; + num_queues = qquanta->queue_select.num_queues; + + if (check_add_overflow(start_qid, num_queues, &end_qid)) { + v_ret = VIRTCHNL_STATUS_ERR_PARAM; + goto err; + } + if (!test_bit(ICE_VF_STATE_ACTIVE, vf->vf_states)) { v_ret = VIRTCHNL_STATUS_ERR_PARAM; goto err; @@ -1918,8 +1926,6 @@ static int ice_vc_cfg_q_quanta(struct ice_vf *vf, u8 *msg) goto err; } - end_qid = qquanta->queue_select.start_queue_id + - qquanta->queue_select.num_queues; if (end_qid > ICE_MAX_RSS_QS_PER_VF || end_qid > min_t(u16, vsi->alloc_txq, vsi->alloc_rxq)) { dev_err(ice_pf_to_dev(vf->pf), "VF-%d trying to configure more than allocated number of queues: %d\n", @@ -1948,7 +1954,6 @@ static int ice_vc_cfg_q_quanta(struct ice_vf *vf, u8 *msg) goto err; } - start_qid = qquanta->queue_select.start_queue_id; for (i = start_qid; i < end_qid; i++) vsi->tx_rings[i]->quanta_prof_id = quanta_prof_id; -- 2.39.5