diff mbox series

[13/14] net/ice/base: fix uninitialized struct

Message ID	20210302072357.1657556-14-qi.z.zhang@intel.com (mailing list archive)
State	Accepted, archived
Delegated to:	Qi Zhang
Headers	IronPort-SDR: QuTxR/3MgxslPiGf6a8N1jV99kMhJEyjzvN1XCN4sK1Wvu2noUzUFtJc5A1R1V1s+tSAI/92jS 37v0+wl16UCg== IronPort-SDR: onKBisyhQEMQwdMCARaQlwXB3XJ8zpk+dEs9p2F0pXMsUrcJkgJzqzJ90vZ2u8qxyIUA8Z92ZG N0iQn4jqIIBw== From: Qi Zhang <qi.z.zhang@intel.com> To: qiming.yang@intel.com Cc: dev@dpdk.org, haiyue.wang@intel.com, junfeng.guo@intel.com, Qi Zhang <qi.z.zhang@intel.com>, stable@dpdk.org, Jesse Brandeburg <jesse.brandeburg@intel.com> Date: Tue, 2 Mar 2021 15:23:56 +0800 Message-Id: <20210302072357.1657556-14-qi.z.zhang@intel.com> In-Reply-To: <20210302072357.1657556-1-qi.z.zhang@intel.com> References: <20210302072357.1657556-1-qi.z.zhang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 13/14] net/ice/base: fix uninitialized struct Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	ice: base code update \| [00/14] ice: base code update [01/14] net/ice/base: add firmware log support [02/14] net/ice/base: signed external device package programming [03/14] net/ice/base: post update double reset solution restriction [04/14] net/ice/base: enable GTPU inner L3/L4 for FDIR [05/14] net/ice/base: expose link configuration error [06/14] net/ice/base: enable more GTPU inner L3 fields for FDIR [07/14] net/ice/base: support for switch filter (GTP tunnel+IP flow) [08/14] net/ice/base: support GTPU IP inner IPv6 for FDIR [09/14] net/ice/base: fix incorrect payload indicator on PTYPE [10/14] net/ice/base: mark PTYPE 2 as reserved [11/14] net/ice/base: add code to update boost TCAM for DVM [12/14] net/ice/base: update GTPU EH dummy pkts for FDIR [13/14] net/ice/base: fix uninitialized struct [14/14] net/ice/base: cleanup fltr list in case of allocation issues

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Qi Zhang March 2, 2021, 7:23 a.m. UTC

  One of the structs being used for ACL counter rules was allocated on
the stack and left uninitialized.  Rather than depending on
undefined behavior around the .amount member during rule removal,
just leave a comment and initialize the struct to zero, as this is a
slow path call anyway. This bug could have caused silent failures
during counter removal.

Fixes: f3202a097f12 ("net/ice/base: add ACL module")
Cc: stable@dpdk.org

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ice/base/ice_flow.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c
index a081fbe5a4..d123206fc6 100644
--- a/drivers/net/ice/base/ice_flow.c
+++ b/drivers/net/ice/base/ice_flow.c
@@ -1795,9 +1795,14 @@  ice_flow_acl_free_act_cntr(struct ice_hw *hw, struct ice_flow_action *acts,
 		if (acts[i].type == ICE_FLOW_ACT_CNTR_PKT ||
 		    acts[i].type == ICE_FLOW_ACT_CNTR_BYTES ||
 		    acts[i].type == ICE_FLOW_ACT_CNTR_PKT_BYTES) {
-			struct ice_acl_cntrs cntrs;
+			struct ice_acl_cntrs cntrs = { 0 };
 			enum ice_status status;
 
+			/* amount is unused in the dealloc path but the common
+			 * parameter check routine wants a value set, as zero
+			 * is invalid for the check. Just set it.
+			 */
+			cntrs.amount = 1;
 			cntrs.bank = 0; /* Only bank0 for the moment */
 			cntrs.first_cntr =
 					LE16_TO_CPU(acts[i].data.acl_act.value);
@@ -2396,7 +2401,7 @@  ice_flow_acl_check_actions(struct ice_hw *hw, struct ice_flow_action *acts,
 		if (acts[i].type == ICE_FLOW_ACT_CNTR_PKT ||
 		    acts[i].type == ICE_FLOW_ACT_CNTR_BYTES ||
 		    acts[i].type == ICE_FLOW_ACT_CNTR_PKT_BYTES) {
-			struct ice_acl_cntrs cntrs;
+			struct ice_acl_cntrs cntrs = { 0 };
 			enum ice_status status;
 
 			cntrs.amount = 1;