From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3195CA04AB; Tue, 12 Nov 2019 11:09:44 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A770D2C12; Tue, 12 Nov 2019 11:09:26 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 294062BEA for ; Tue, 12 Nov 2019 11:09:23 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Nov 2019 02:09:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,295,1569308400"; d="scan'208";a="214048348" Received: from intel.sh.intel.com ([10.239.255.146]) by fmsmga001.fm.intel.com with ESMTP; 12 Nov 2019 02:09:21 -0800 From: Wang ShougangX To: dev@dpdk.org Cc: qiming.yang@intel.com, qi.z.zhang@intel.com, Wang ShougangX Date: Tue, 12 Nov 2019 03:50:11 +0000 Message-Id: <20191112035011.67537-5-shougangx.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191112035011.67537-1-shougangx.wang@intel.com> References: <20191105033806.2878-1-shougangx.wang@intel.com> <20191112035011.67537-1-shougangx.wang@intel.com> Subject: [dpdk-dev] [PATCH v4 4/4] net/ice: fix wild pointer X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" To avoid wild pointer, pointers should be set to NULL after free them. Fixes: 1a2fc1799f09 ("net/ice: reject duplicated flow for flow director") Fixes: 84dc7a95a2d3 ("net/ice: enable flow director engine") Fixes: 0f880c3df192 ("net/ice: add flow director counter resource init/release") Signed-off-by: Wang ShougangX --- drivers/net/ice/ice_fdir_filter.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 82dd283f7..ac03819ed 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -152,6 +152,7 @@ ice_fdir_prof_alloc(struct ice_hw *hw) if (!hw->fdir_prof) return -ENOMEM; } + for (ptype = ICE_FLTR_PTYPE_NONF_IPV4_UDP; ptype < ICE_FLTR_PTYPE_MAX; ptype++) { @@ -167,9 +168,13 @@ ice_fdir_prof_alloc(struct ice_hw *hw) fail_mem: for (fltr_ptype = ICE_FLTR_PTYPE_NONF_IPV4_UDP; fltr_ptype < ptype; - fltr_ptype++) + fltr_ptype++) { rte_free(hw->fdir_prof[fltr_ptype]); + hw->fdir_prof[fltr_ptype] = NULL; + } + rte_free(hw->fdir_prof); + hw->fdir_prof = NULL; return -ENOMEM; } @@ -249,8 +254,10 @@ ice_fdir_counter_release(struct ice_pf *pf) &fdir_info->counter; uint8_t i; - for (i = 0; i < container->index_free; i++) + for (i = 0; i < container->index_free; i++) { rte_free(container->pools[i]); + container->pools[i] = NULL; + } TAILQ_INIT(&container->pool_list); container->index_free = 0; @@ -400,6 +407,9 @@ ice_fdir_release_filter_list(struct ice_pf *pf) rte_free(fdir_info->hash_map); if (fdir_info->hash_table) rte_hash_free(fdir_info->hash_table); + + fdir_info->hash_map = NULL; + fdir_info->hash_table = NULL; } /* @@ -526,10 +536,13 @@ ice_fdir_prof_free(struct ice_hw *hw) for (ptype = ICE_FLTR_PTYPE_NONF_IPV4_UDP; ptype < ICE_FLTR_PTYPE_MAX; - ptype++) + ptype++) { rte_free(hw->fdir_prof[ptype]); + hw->fdir_prof[ptype] = NULL; + } rte_free(hw->fdir_prof); + hw->fdir_prof = NULL; } /* Remove a profile for some filter type */ -- 2.17.1