From: Wang ShougangX <shougangx.wang@intel.com>
To: dev@dpdk.org
Cc: qiming.yang@intel.com, beilei.xing@intel.com,
Wang ShougangX <shougangx.wang@intel.com>
Subject: [dpdk-dev] [PATCH v3 4/4] net/ice: fix wild pointer
Date: Tue, 12 Nov 2019 00:50:56 +0000 [thread overview]
Message-ID: <20191112005056.30805-5-shougangx.wang@intel.com> (raw)
In-Reply-To: <20191112005056.30805-1-shougangx.wang@intel.com>
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 <shougangx.wang@intel.com>
---
drivers/net/ice/ice_fdir_filter.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c
index 361969f71..78754f365 100644
--- a/drivers/net/ice/ice_fdir_filter.c
+++ b/drivers/net/ice/ice_fdir_filter.c
@@ -152,6 +152,10 @@ ice_fdir_prof_alloc(struct ice_hw *hw)
if (!hw->fdir_prof)
return -ENOMEM;
}
+
+ /* To avoid wild pointer, unused field pointer should be NULL */
+ hw->fdir_prof[ICE_FLTR_PTYPE_NONF_NONE] = NULL;
+
for (ptype = ICE_FLTR_PTYPE_NONF_IPV4_UDP;
ptype < ICE_FLTR_PTYPE_MAX;
ptype++) {
@@ -167,9 +171,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 +257,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 +410,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 +539,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
next prev parent reply other threads:[~2019-11-12 7:10 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 3:38 [dpdk-dev] [PATCH] " Wang ShougangX
2019-11-07 2:22 ` [dpdk-dev] [PATCH v2 0/4] net/ice: fix memory release in FDIR Wang ShougangX
2019-11-07 2:22 ` [dpdk-dev] [PATCH v2 1/4] net/ice: fix memzone reserve and " Wang ShougangX
2019-11-11 8:09 ` Ye Xiaolong
2019-11-11 8:39 ` Wang, ShougangX
2019-11-07 2:22 ` [dpdk-dev] [PATCH v2 2/4] net/ice: fix removal of FDIR profile Wang ShougangX
2019-11-07 2:22 ` [dpdk-dev] [PATCH v2 3/4] net/ice: fix FDIR counter resource release Wang ShougangX
2019-11-07 2:22 ` [dpdk-dev] [PATCH v2 4/4] net/ice: fix wild pointer Wang ShougangX
2019-11-12 0:00 ` [dpdk-dev] [PATCH v3 0/4] net/ice: fix memory release in FDIR Wang ShougangX
2019-11-12 0:10 ` Wang ShougangX
2019-11-12 0:10 ` [dpdk-dev] [PATCH v3 1/4] net/ice: fix memzone reserve and " Wang ShougangX
2019-11-12 0:10 ` [dpdk-dev] [PATCH v3 2/4] net/ice: fix removal of FDIR profile Wang ShougangX
2019-11-12 0:10 ` [dpdk-dev] [PATCH v3 3/4] net/ice: fix FDIR counter resource release Wang ShougangX
2019-11-12 0:10 ` [dpdk-dev] [PATCH v3 4/4] net/ice: fix wild pointer Wang ShougangX
2019-11-12 0:26 ` [dpdk-dev] [PATCH v3 0/4] net/ice: fix memory release in FDIR Wang ShougangX
2019-11-12 0:26 ` [dpdk-dev] [PATCH v3 1/4] net/ice: fix memzone reserve and " Wang ShougangX
2019-11-12 0:26 ` [dpdk-dev] [PATCH v3 2/4] net/ice: fix removal of FDIR profile Wang ShougangX
2019-11-12 0:27 ` [dpdk-dev] [PATCH v3 3/4] net/ice: fix FDIR counter resource release Wang ShougangX
2019-11-12 7:42 ` Zhang, Qi Z
2019-11-12 0:27 ` [dpdk-dev] [PATCH v3 4/4] net/ice: fix wild pointer Wang ShougangX
2019-11-12 7:39 ` Zhang, Qi Z
2019-11-12 0:50 ` [dpdk-dev] [PATCH v3 0/4] net/ice: fix memory release in FDIR Wang ShougangX
2019-11-12 0:50 ` [dpdk-dev] [PATCH v3 1/4] net/ice: fix memzone reserve and " Wang ShougangX
2019-11-12 7:45 ` Zhang, Qi Z
2019-11-12 0:50 ` [dpdk-dev] [PATCH v3 2/4] net/ice: fix removal of FDIR profile Wang ShougangX
2019-11-12 7:50 ` Zhang, Qi Z
2019-11-12 8:03 ` Wang, ShougangX
2019-11-12 0:50 ` [dpdk-dev] [PATCH v3 3/4] net/ice: fix FDIR counter resource release Wang ShougangX
2019-11-12 0:50 ` Wang ShougangX [this message]
2019-11-07 3:19 ` [dpdk-dev] [PATCH] net/ice: fix wild pointer Ye Xiaolong
2019-11-07 3:30 ` Ye Xiaolong
2019-11-07 5:44 ` Wang, ShougangX
2019-11-12 3:50 ` [dpdk-dev] [PATCH v4 0/4] net/ice: fix memory release in FDIR Wang ShougangX
2019-11-12 3:50 ` [dpdk-dev] [PATCH v4 1/4] net/ice: fix memzone reserve and " Wang ShougangX
2019-11-12 3:50 ` [dpdk-dev] [PATCH v4 2/4] net/ice: fix removal of FDIR profile Wang ShougangX
2019-11-12 10:36 ` Yang, Qiming
2019-11-13 6:21 ` Wang, ShougangX
2019-11-12 3:50 ` [dpdk-dev] [PATCH v4 3/4] net/ice: fix FDIR counter resource release Wang ShougangX
2019-11-12 3:50 ` [dpdk-dev] [PATCH v4 4/4] net/ice: fix wild pointer Wang ShougangX
2019-11-13 1:37 ` [dpdk-dev] [PATCH v5 0/4] net/ice: fix memory release in FDIR Wang ShougangX
2019-11-13 1:37 ` [dpdk-dev] [PATCH v5 1/4] net/ice: fix memzone reserve and " Wang ShougangX
2019-11-13 1:37 ` [dpdk-dev] [PATCH v5 2/4] net/ice: fix removal of FDIR profile Wang ShougangX
2019-11-13 8:44 ` Yang, Qiming
2019-11-13 1:37 ` [dpdk-dev] [PATCH v5 3/4] net/ice: fix FDIR counter resource release Wang ShougangX
2019-11-13 1:37 ` [dpdk-dev] [PATCH v5 4/4] net/ice: fix wild pointer Wang ShougangX
2019-11-13 8:44 ` Yang, Qiming
2019-11-13 8:54 ` [dpdk-dev] [PATCH v5 0/4] net/ice: fix memory release in FDIR Ye Xiaolong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191112005056.30805-5-shougangx.wang@intel.com \
--to=shougangx.wang@intel.com \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=qiming.yang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).