From patchwork Mon Feb 17 10:27:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martyna Szapar-Mudlaw X-Patchwork-Id: 13977517 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (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 5076F217646 for ; Mon, 17 Feb 2025 10:28:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739788111; cv=none; b=iBYv7yncvZw3P9M2xPrz510Edpqf61RPGWaNjuiUd0jQr5/xq7gSY1UQHcJWDghQ+DChKJCoKNsajKWFg0qIZZpxNf+Ea8rtpTu0EeiI8JHfwJ5zoIDSBpuv0+n8wpdmqmYezO85BfHE9rQ8Yq+i2gy7ZjaXQbfg4IXqz5RCxik= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739788111; c=relaxed/simple; bh=eind2xzv457E4eHcksBryEozwBnJEEjhqhm0h6DsxyQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dxc7SMSlhW8ByF1epGc/W6rP3Ug20vvWjsp4C6z1Nu1rn3ABISlfiQ8fZawLrP6DZqH4JfPGtPwgoVTH6EnQfenQIMQIPTua3ulWLM7lL6nDgi2G0Qh46dmVwX2dRTxNxwr4kR/8zhfqUFllQUyYsGwbHQunk6EORpp+4lENx/s= 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=jLoLIXdN; arc=none smtp.client-ip=198.175.65.20 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="jLoLIXdN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739788110; x=1771324110; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eind2xzv457E4eHcksBryEozwBnJEEjhqhm0h6DsxyQ=; b=jLoLIXdNVg/2obuMJHDJef0CuLKOLy1LICuoj3iNpGpKc491BEBHCmJS miw2bhoMZQoFLTN6bRYKD9wswD8ruvKsbK+8vX5u25PkwAeZY+uu/XPdM mST91ISksGohIf6UzEA0mwdLGL7S0WGlZ6D+RR8Z8UgrvJDOZn48mFeeg H7WZayuiaInAykTlwgnv1Rb3tGwAkrveyVLpH+8Db61eQxFSmTIz0QweF 6tW3U0FkgIHBiTzyDmYar0htks5/Cnm1Bcuyi057DE5j0Dv1MvyaohGfu Iy1/zaA+H5gBv3SuXBrwhAaDA1gguY7fWadjl7nLzQ/jZPOaYrA362sr1 w==; X-CSE-ConnectionGUID: rjynj3NmQwG6MPtvOh2LCQ== X-CSE-MsgGUID: bVhFXtpDTO20ofY2Jm5B+Q== X-IronPort-AV: E=McAfee;i="6700,10204,11347"; a="40168395" X-IronPort-AV: E=Sophos;i="6.13,292,1732608000"; d="scan'208";a="40168395" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2025 02:28:30 -0800 X-CSE-ConnectionGUID: vCeOmfrgTpydwcKwXMC62A== X-CSE-MsgGUID: AkkyC4K9QqmCMrXVCg1/lA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,292,1732608000"; d="scan'208";a="114598244" Received: from enterprise.igk.intel.com ([10.102.20.175]) by fmviesa010.fm.intel.com with ESMTP; 17 Feb 2025 02:28:28 -0800 From: Martyna Szapar-Mudlaw To: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, Jan Glaza , Jedrzej Jagielski , Martyna Szapar-Mudlaw Subject: [iwl-net 1/4] virtchnl: make proto and filter action count unsigned Date: Mon, 17 Feb 2025 11:27:43 +0100 Message-ID: <20250217102744.300357-4-martyna.szapar-mudlaw@linux.intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250217102744.300357-2-martyna.szapar-mudlaw@linux.intel.com> References: <20250217102744.300357-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 Count can never be negative and valid. Change it to unsigned to simplify handling virtchnl messages in drivers. Fixes: 1f7ea1cd6a374 ("ice: Enable FDIR Configure for AVF") Reviewed-by: Jedrzej Jagielski Signed-off-by: Jan Glaza Signed-off-by: Martyna Szapar-Mudlaw --- include/linux/avf/virtchnl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/avf/virtchnl.h b/include/linux/avf/virtchnl.h index 4811b9a14604..cf0afa60e4a7 100644 --- a/include/linux/avf/virtchnl.h +++ b/include/linux/avf/virtchnl.h @@ -1343,7 +1343,7 @@ struct virtchnl_proto_hdrs { * 2 - from the second inner layer * .... **/ - int count; /* the proto layers must < VIRTCHNL_MAX_NUM_PROTO_HDRS */ + u32 count; /* the proto layers must < VIRTCHNL_MAX_NUM_PROTO_HDRS */ union { struct virtchnl_proto_hdr proto_hdr[VIRTCHNL_MAX_NUM_PROTO_HDRS]; @@ -1395,7 +1395,7 @@ VIRTCHNL_CHECK_STRUCT_LEN(36, virtchnl_filter_action); struct virtchnl_filter_action_set { /* action number must be less then VIRTCHNL_MAX_NUM_ACTIONS */ - int count; + u32 count; struct virtchnl_filter_action actions[VIRTCHNL_MAX_NUM_ACTIONS]; }; From patchwork Mon Feb 17 10:27:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martyna Szapar-Mudlaw X-Patchwork-Id: 13977518 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (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 4115D217648 for ; Mon, 17 Feb 2025 10:28:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739788122; cv=none; b=sYj9hT9NzS9RtSHh4QxXRr2P7X6ljd7vug+LBwReLNAZjTBDQiYSIqQ8CFL1L4hAMIyxR/gtbwSJqzYauEsflMgbEw5zGFUgyR2ytpCNkXTxoCcw6OwW0XwTPJcAVFBEBc7T4EpK15+tdwt7KKxsU/JcnUe/K3/ZNle6XeX/2qI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739788122; c=relaxed/simple; bh=o883OfTm68rDA6RHHWWy73WfvDjr1+zc/EcXXU3GS3w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DzAdUrFMqEC4Q5Or0Rtk0F2iqUKLxUaH9cuF4O+a10cZ0GgW0Egl4xJ1UO2zdb2rR4wFwzpkG9eZ0wP0TODQFrqOd+tKqvMhI4sxy7FCIXXMeKZvBwcASHS8JgzYuSHtdxgTZvE2lm7iGVy6KqabRb3jURTGAgxnKihKIAzILss= 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=b9D9do1h; arc=none smtp.client-ip=198.175.65.20 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="b9D9do1h" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739788121; x=1771324121; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=o883OfTm68rDA6RHHWWy73WfvDjr1+zc/EcXXU3GS3w=; b=b9D9do1hfeoB5A1iLE+/xV7Yelw9q3OY/MU8VEOELGvk/BUX6DMlLBxZ 260bPn01O3mue10z9rQbG4BvqD2f4C4qriBNq6pQI1FkqTMhaj1iYIU9i mLixivn1ql3iHYDAhRiMBOcIJCnTPIFpGnlvtc/DG4p/lm8gDRgxLU/jb NZIRLg+eUvtBZqpcPkud42MVWY5OZsz3Wbpb22tklFV+T87o89Hx6nj1h nIKoEx+Y5wLdOx9bSfbRqQwKgxfnH0idmcxss55UabtTrvn6EQaHK6bVY bHgRLxxmyCBzeaRTis0yk+cbIh/j4yWmlZ9vJ34oYbGc7NJ9nF9HD++Ju Q==; X-CSE-ConnectionGUID: Hpbmzr2fQJ6A1zCrzXD0fA== X-CSE-MsgGUID: fpse3GA9Q9qNvMQIUztgiA== X-IronPort-AV: E=McAfee;i="6700,10204,11347"; a="40168410" X-IronPort-AV: E=Sophos;i="6.13,292,1732608000"; d="scan'208";a="40168410" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2025 02:28:39 -0800 X-CSE-ConnectionGUID: EOgKHumnRAKbWTkaD3+A7w== X-CSE-MsgGUID: T3A0wCpsT1W9DzKwclcX1g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,292,1732608000"; d="scan'208";a="114598267" Received: from enterprise.igk.intel.com ([10.102.20.175]) by fmviesa010.fm.intel.com with ESMTP; 17 Feb 2025 02:28:37 -0800 From: Martyna Szapar-Mudlaw To: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, Jan Glaza , Aleksandr Loktionov , Jedrzej Jagielski , Martyna Szapar-Mudlaw Subject: [iwl-net 2/4] ice: stop truncating queue ids when checking Date: Mon, 17 Feb 2025 11:27:45 +0100 Message-ID: <20250217102744.300357-6-martyna.szapar-mudlaw@linux.intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250217102744.300357-2-martyna.szapar-mudlaw@linux.intel.com> References: <20250217102744.300357-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 Queue IDs can be up to 4096, update invalid check to stop truncating IDs to 8 bits. Fixes: bf93bf791cec8 ("ice: introduce ice_virtchnl.c and ice_virtchnl.h") Reviewed-by: Aleksandr Loktionov Reviewed-by: Jedrzej Jagielski Signed-off-by: Jan Glaza Signed-off-by: Martyna Szapar-Mudlaw --- drivers/net/ethernet/intel/ice/ice_virtchnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.c b/drivers/net/ethernet/intel/ice/ice_virtchnl.c index b6285433307c..343f2b4b0dc5 100644 --- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c @@ -565,7 +565,7 @@ bool ice_vc_isvalid_vsi_id(struct ice_vf *vf, u16 vsi_id) * * check for the valid queue ID */ -static bool ice_vc_isvalid_q_id(struct ice_vsi *vsi, u8 qid) +static bool ice_vc_isvalid_q_id(struct ice_vsi *vsi, u16 qid) { /* allocated Tx and Rx queues should be always equal for VF VSI */ return qid < vsi->alloc_txq; From patchwork Mon Feb 17 10:27:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martyna Szapar-Mudlaw X-Patchwork-Id: 13977519 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (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 522E3216E14 for ; Mon, 17 Feb 2025 10:28:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739788138; cv=none; b=YBlQWIRYNaQnjXin7yjgjgYU0HSqQrIqNI3ok8+YIXGSLKccDOyc3aSh2IxbwXigipAXbzH5E+ETTVqRKfnSETKLMYmXN7cTW7Levg2uM5jWqvwtXZvnhTwVLn+ePUq95S2hqziNsp2HZwrWr/tx9rkDLkjWNt/pZycOBWu8KyI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739788138; c=relaxed/simple; bh=qvH744x9n/EIaRK81PRkt4ItVtZ4IA+MhzAIe0c3AxQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BQsiURfESykbuPYUa+3jYObH0iIa+Xm97qIY2liYWBdUNxRkNwy/roK3wwY5Tafqv05/9oueD9jQ+qOUpIId8jlglPyNqWQH+fXF3lps3Pz7DcZvlvMcBhUAos1Ovw99k1OFflnpfoyDmIS34FIiWd/oo3GRuOTV86j5z++x610= 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=L1saTG+k; arc=none smtp.client-ip=198.175.65.20 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="L1saTG+k" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739788137; x=1771324137; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qvH744x9n/EIaRK81PRkt4ItVtZ4IA+MhzAIe0c3AxQ=; b=L1saTG+kB8nSRp7lBG4IYfNhsbiuRBc9GUWA1qSCt00umjJbAojHuwy7 KC2tlDC1e5xTN8yHXIBL8hDcY+QSkXl6buoCEEJ/vkLjrNHh6LcgIKM0B o46DTgE9rDvxjnGZ3gVaRN1YIB1lzFJtSwxyKK2sN8Gr6Vu69C97Xzlau 6QaNBmNcyG69NksRBrje4p0e32Jd+CAW87gSKiHmqP06L2zRjLNsZoD1F gAtVz8QJWGYoxNG9eMz7JNPFy7A53eSuSdZoP95oOBOVJtD6c679LqO32 ftcpR8UbL/tL6yV9TV/u+eBuUlAcvTsDVfU+Q7WnY4vdTTaHP+fnoiZKH g==; X-CSE-ConnectionGUID: Mebub26ETfSAK1aGn522/A== X-CSE-MsgGUID: jADEv+niTfKmt4hno6XEMA== X-IronPort-AV: E=McAfee;i="6700,10204,11347"; a="40168442" X-IronPort-AV: E=Sophos;i="6.13,292,1732608000"; d="scan'208";a="40168442" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2025 02:28:53 -0800 X-CSE-ConnectionGUID: h3LNOBPlQBCa3ZpNLCw3dw== X-CSE-MsgGUID: 606Xn9IHREKY1xauiskqxA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,292,1732608000"; d="scan'208";a="114598308" Received: from enterprise.igk.intel.com ([10.102.20.175]) by fmviesa010.fm.intel.com with ESMTP; 17 Feb 2025 02:28:51 -0800 From: Martyna Szapar-Mudlaw To: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, Jan Glaza , Jedrzej Jagielski , Martyna Szapar-Mudlaw Subject: [iwl-net 3/4] ice: validate queue quanta parameters to prevent OOB access Date: Mon, 17 Feb 2025 11:27:47 +0100 Message-ID: <20250217102744.300357-8-martyna.szapar-mudlaw@linux.intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250217102744.300357-2-martyna.szapar-mudlaw@linux.intel.com> References: <20250217102744.300357-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 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; From patchwork Mon Feb 17 10:27:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martyna Szapar-Mudlaw X-Patchwork-Id: 13977520 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (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 ED1892165E3 for ; Mon, 17 Feb 2025 10:29:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739788145; cv=none; b=VsZ6eiJLE7WAeQ+da6bzTzmpe/8yw7sXPJPNiot0Isb1JqXWuYRTq21naBijoQ3XsBZI6FCkmxjb01TpKFrI59Vd9pPys9A9Rp+gK6GqdxYLUfa1HLPdASNf0vb/a7if9NwKeyIbAvvoVws7sIDAchw6nW7F8dvPal1VO6FCzbw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739788145; c=relaxed/simple; bh=vFNOcW6D9AQ3oR7l/kDMzH69hgRBYY0HS+iPzompEAY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FUgGQiEvH6glUuoCnegMhe1EOYsxBk4zgF1jSCHmFXHUcCYgCYqnOfncTEKQJm916vQUm0vpuMsIcJxJLOwvTCumfYxYYcHm5Bfk+i+CGbqRmJNS7iHsVT4mIQZfHHPG1DBFZjkxCHTFfW4Q2gfWTwXIosOGBJ+/fQOaSMSmb9Q= 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=N+YFXl5T; arc=none smtp.client-ip=198.175.65.20 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="N+YFXl5T" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739788144; x=1771324144; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vFNOcW6D9AQ3oR7l/kDMzH69hgRBYY0HS+iPzompEAY=; b=N+YFXl5TMTtoMI9AdcuMDNqjuz1rykXKqajNrymvomL5PX16Qc+Iw8bw tOlCQQR0RfuIGSF6t4BG0iW29U67Lh6S0XBuQV5N4WIhlnhe6ZbIybwEH 0vnChI8gnb5q5XxKSEtCUTJq7eAi07QHsjhF/aKO8QRsMM5YQ7SdqHx0q +cmw7tJ3RQAnmxwHhGrQg+BS74riR/d7sXSvPG5IQ0ZAR2+EGTTwKO/Nx Dn/FP+s5v6KL1NP+MZBhI153PfrI3C3TNNp2rxVp/k16hEAfU7ekM1UK1 f9v/nm/fJEaz+vc41GT1Q88QWrNq7f+JwbiwdyjWQXjEL++b+SEoh1OdS g==; X-CSE-ConnectionGUID: gjMWMjSkSOahXvwW3fV4lg== X-CSE-MsgGUID: c/CYk5bqRsmFU7ru/auYgw== X-IronPort-AV: E=McAfee;i="6700,10204,11347"; a="40168463" X-IronPort-AV: E=Sophos;i="6.13,292,1732608000"; d="scan'208";a="40168463" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2025 02:29:03 -0800 X-CSE-ConnectionGUID: 1rCOmPpBQSulMvzuw0xhDQ== X-CSE-MsgGUID: chSRxClPSmauDPxdv4mN2A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,292,1732608000"; d="scan'208";a="114598347" Received: from enterprise.igk.intel.com ([10.102.20.175]) by fmviesa010.fm.intel.com with ESMTP; 17 Feb 2025 02:29:02 -0800 From: Martyna Szapar-Mudlaw To: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, Lukasz Czapnik , Jedrzej Jagielski , Martyna Szapar-Mudlaw Subject: [iwl-net 4/4] ice: fix input validation for virtchnl BW Date: Mon, 17 Feb 2025 11:27:49 +0100 Message-ID: <20250217102744.300357-10-martyna.szapar-mudlaw@linux.intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250217102744.300357-2-martyna.szapar-mudlaw@linux.intel.com> References: <20250217102744.300357-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: Lukasz Czapnik Add validation of tc and queue id values sent by a VF in ice_vc_cfg_q_bw(). Additionally fixed logged value in the warning message, where max_tx_rate was incorrectly referenced instead of min_tx_rate. Also improve error handling in this function by properly exiting when invalid configuration is detected. Fixes: 015307754a19 ("ice: Support VF queue rate limit and quanta size configuration") Reviewed-by: Jedrzej Jagielski Signed-off-by: Lukasz Czapnik Co-developed-by: Martyna Szapar-Mudlaw Signed-off-by: Martyna Szapar-Mudlaw --- drivers/net/ethernet/intel/ice/ice_virtchnl.c | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.c b/drivers/net/ethernet/intel/ice/ice_virtchnl.c index adb1bf12542f..824ef849b0ea 100644 --- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c @@ -1865,15 +1865,33 @@ static int ice_vc_cfg_q_bw(struct ice_vf *vf, u8 *msg) for (i = 0; i < qbw->num_queues; i++) { if (qbw->cfg[i].shaper.peak != 0 && vf->max_tx_rate != 0 && - qbw->cfg[i].shaper.peak > vf->max_tx_rate) + qbw->cfg[i].shaper.peak > vf->max_tx_rate) { dev_warn(ice_pf_to_dev(vf->pf), "The maximum queue %d rate limit configuration may not take effect because the maximum TX rate for VF-%d is %d\n", qbw->cfg[i].queue_id, vf->vf_id, vf->max_tx_rate); + v_ret = VIRTCHNL_STATUS_ERR_PARAM; + goto err; + } if (qbw->cfg[i].shaper.committed != 0 && vf->min_tx_rate != 0 && - qbw->cfg[i].shaper.committed < vf->min_tx_rate) + qbw->cfg[i].shaper.committed < vf->min_tx_rate) { dev_warn(ice_pf_to_dev(vf->pf), "The minimum queue %d rate limit configuration may not take effect because the minimum TX rate for VF-%d is %d\n", qbw->cfg[i].queue_id, vf->vf_id, - vf->max_tx_rate); + vf->min_tx_rate); + v_ret = VIRTCHNL_STATUS_ERR_PARAM; + goto err; + } + if (qbw->cfg[i].queue_id > vf->num_vf_qs) { + dev_warn(ice_pf_to_dev(vf->pf), "VF-%d trying to configure invalid queue_id\n", + vf->vf_id); + v_ret = VIRTCHNL_STATUS_ERR_PARAM; + goto err; + } + if (qbw->cfg[i].tc >= ICE_MAX_TRAFFIC_CLASS) { + dev_warn(ice_pf_to_dev(vf->pf), "VF-%d trying to configure a traffic class higher than allowed\n", + vf->vf_id); + v_ret = VIRTCHNL_STATUS_ERR_PARAM; + goto err; + } } for (i = 0; i < qbw->num_queues; i++) {