From patchwork Tue Mar 4 11:08:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Szapar-Mudlaw, Martyna" X-Patchwork-Id: 14000472 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (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 905601FF601 for ; Tue, 4 Mar 2025 11:09:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741086559; cv=none; b=cgye7kO7ss6EN3KstuL1pr/M7XuLLnzekOyZLcmtVBQcC4Kykcvynf8+BHTlHsEbnY4eeIYRz0y/btVYTIMzRqiFIus/gvZ3llXGXMMVuYP9D8aGO8y21jaoaErDMctWLGGzxfZ/Rqtxqq+7FDDK141wJDM/f01WymcDkIDBCeQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741086559; c=relaxed/simple; bh=3GlyvXMisaidBEam8T+nDgJqMed2mKAfCnPGZWzpKdY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hyQylxrxOBVGOjJQt/PxFanmcsg87dy2a117sXkwMAAtUQkTrZB7rTVVmkrl0/V8hGQweqhxX0mWabqunRTpBSQzPLyL3XCdS2v9O67RreuZ8uTeEExmsDc7dLPM1FhUk/w301r5W9lbCYkI8hn0ORcM8lmFt6d4A7Ke+hnCzvA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=kXYGKyM/; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="kXYGKyM/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741086557; x=1772622557; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3GlyvXMisaidBEam8T+nDgJqMed2mKAfCnPGZWzpKdY=; b=kXYGKyM/F7UMqxlC9aDqlkkDmiO+dJXwMeQntbZkKyyDzaXOf3XEkT/6 xWCF8zcyVe1YGRMXs6+/GsS3LJZMMCyuE4uakrv5W9CzDKFXPnbTIDKQ+ rCdm44CGa70uOK5pc+NW3jh1o7UavRg64+rsjt9YV09q5CybpTO82AkIn H76ngj/UVl//NvLQwBlo/5WkW9RiomnKhJgqP2NQHLltn0owi6twMnubl NvdHZZy8aJcppqydX7hipKoAobmqnk1mNEhzMbUZ6ZHi/3ZxUTFPHZqrz 7iMukNgRECKRocr+TDKeRURAn2QmNh5T6ohSaAWeA7S1hawsf2U+N5bH9 A==; X-CSE-ConnectionGUID: Wf5jyIGoQFy7+xpSoChepg== X-CSE-MsgGUID: MmLMZObjSOmTh7YwNyMrUQ== X-IronPort-AV: E=McAfee;i="6700,10204,11362"; a="41247024" X-IronPort-AV: E=Sophos;i="6.13,331,1732608000"; d="scan'208";a="41247024" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2025 03:09:15 -0800 X-CSE-ConnectionGUID: TU/6t8OCSyaVmiPD9I2TgA== X-CSE-MsgGUID: fnxn7LeyQnmxskOdkQpT8A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,331,1732608000"; d="scan'208";a="118341376" Received: from enterprise.igk.intel.com ([10.102.20.175]) by fmviesa007.fm.intel.com with ESMTP; 04 Mar 2025 03:09:13 -0800 From: Martyna Szapar-Mudlaw To: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, Jan Glaza , Jedrzej Jagielski , Simon Horman , Martyna Szapar-Mudlaw Subject: [iwl-net v3 3/5] ice: validate queue quanta parameters to prevent OOB access Date: Tue, 4 Mar 2025 12:08:33 +0100 Message-ID: <20250304110833.95997-6-martyna.szapar-mudlaw@linux.intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250304110833.95997-2-martyna.szapar-mudlaw@linux.intel.com> References: <20250304110833.95997-2-martyna.szapar-mudlaw@linux.intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jan Glaza 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 --- 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 343f2b4b0dc5..adb1bf12542f 100644 --- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c @@ -1903,13 +1903,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; @@ -1921,8 +1929,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", @@ -1951,7 +1957,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;