* [dpdk-dev] [PATCH v4] net/i40e: add null point check and fix mem leak
@ 2018-01-25 9:01 Yong Wang
2018-01-26 4:57 ` Xing, Beilei
0 siblings, 1 reply; 3+ messages in thread
From: Yong Wang @ 2018-01-25 9:01 UTC (permalink / raw)
To: beilei.xing; +Cc: dev, Yong Wang
There are several func calls to rte_zmalloc() which don't do null
point check on the return value. And before return, the memory is not
freed. Fix it by adding null point check and rte_free().
Fixes: 078259773da9 ("net/i40e: store ethertype filter")
Fixes: 425c3325f0b0 ("net/i40e: store tunnel filter")
Fixes: c50474f31efe ("net/i40e: support tunnel filter to VF")
Fixes: 5c53c82c8174 ("net/i40e: store flow director filter")
Signed-off-by: Yong Wang <wang.yong19@zte.com.cn>
---
v4:
* Add description and fix information.
v3:
* Rebase on master and modify again.
v2:
* Fix code style warning.
---
drivers/net/i40e/i40e_ethdev.c | 32 ++++++++++++++++++++++++++++++++
drivers/net/i40e/i40e_fdir.c | 7 +++++++
2 files changed, 39 insertions(+)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index c4df65d..277c1a8 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -7188,11 +7188,13 @@ struct i40e_tunnel_filter *
node = i40e_sw_tunnel_filter_lookup(tunnel_rule, &check_filter.input);
if (add && node) {
PMD_DRV_LOG(ERR, "Conflict with existing tunnel rules!");
+ rte_free(cld_filter);
return -EINVAL;
}
if (!add && !node) {
PMD_DRV_LOG(ERR, "There's no corresponding tunnel filter!");
+ rte_free(cld_filter);
return -EINVAL;
}
@@ -7201,16 +7203,26 @@ struct i40e_tunnel_filter *
vsi->seid, &cld_filter->element, 1);
if (ret < 0) {
PMD_DRV_LOG(ERR, "Failed to add a tunnel filter.");
+ rte_free(cld_filter);
return -ENOTSUP;
}
tunnel = rte_zmalloc("tunnel_filter", sizeof(*tunnel), 0);
+ if (tunnel == NULL) {
+ PMD_DRV_LOG(ERR, "Failed to alloc memory.");
+ rte_free(cld_filter);
+ return -ENOMEM;
+ }
+
rte_memcpy(tunnel, &check_filter, sizeof(check_filter));
ret = i40e_sw_tunnel_filter_insert(pf, tunnel);
+ if (ret < 0)
+ rte_free(tunnel);
} else {
ret = i40e_aq_remove_cloud_filters(hw, vsi->seid,
&cld_filter->element, 1);
if (ret < 0) {
PMD_DRV_LOG(ERR, "Failed to delete a tunnel filter.");
+ rte_free(cld_filter);
return -ENOTSUP;
}
ret = i40e_sw_tunnel_filter_del(pf, &node->input);
@@ -7639,6 +7651,7 @@ i40e_status_code i40e_replace_gtp_cloud_filter(struct i40e_pf *pf)
else {
if (tunnel_filter->vf_id >= pf->vf_num) {
PMD_DRV_LOG(ERR, "Invalid argument.");
+ rte_free(cld_filter);
return -EINVAL;
}
vf = &pf->vfs[tunnel_filter->vf_id];
@@ -7653,11 +7666,13 @@ i40e_status_code i40e_replace_gtp_cloud_filter(struct i40e_pf *pf)
node = i40e_sw_tunnel_filter_lookup(tunnel_rule, &check_filter.input);
if (add && node) {
PMD_DRV_LOG(ERR, "Conflict with existing tunnel rules!");
+ rte_free(cld_filter);
return -EINVAL;
}
if (!add && !node) {
PMD_DRV_LOG(ERR, "There's no corresponding tunnel filter!");
+ rte_free(cld_filter);
return -EINVAL;
}
@@ -7670,11 +7685,20 @@ i40e_status_code i40e_replace_gtp_cloud_filter(struct i40e_pf *pf)
vsi->seid, &cld_filter->element, 1);
if (ret < 0) {
PMD_DRV_LOG(ERR, "Failed to add a tunnel filter.");
+ rte_free(cld_filter);
return -ENOTSUP;
}
tunnel = rte_zmalloc("tunnel_filter", sizeof(*tunnel), 0);
+ if (tunnel == NULL) {
+ PMD_DRV_LOG(ERR, "Failed to alloc memory.");
+ rte_free(cld_filter);
+ return -ENOMEM;
+ }
+
rte_memcpy(tunnel, &check_filter, sizeof(check_filter));
ret = i40e_sw_tunnel_filter_insert(pf, tunnel);
+ if (ret < 0)
+ rte_free(tunnel);
} else {
if (big_buffer)
ret = i40e_aq_remove_cloud_filters_big_buffer(
@@ -7684,6 +7708,7 @@ i40e_status_code i40e_replace_gtp_cloud_filter(struct i40e_pf *pf)
&cld_filter->element, 1);
if (ret < 0) {
PMD_DRV_LOG(ERR, "Failed to delete a tunnel filter.");
+ rte_free(cld_filter);
return -ENOTSUP;
}
ret = i40e_sw_tunnel_filter_del(pf, &node->input);
@@ -9295,9 +9320,16 @@ struct i40e_ethertype_filter *
if (add) {
ethertype_filter = rte_zmalloc("ethertype_filter",
sizeof(*ethertype_filter), 0);
+ if (ethertype_filter == NULL) {
+ PMD_DRV_LOG(ERR, "Failed to alloc memory.");
+ return -ENOMEM;
+ }
+
rte_memcpy(ethertype_filter, &check_filter,
sizeof(check_filter));
ret = i40e_sw_ethertype_filter_insert(pf, ethertype_filter);
+ if (ret < 0)
+ rte_free(ethertype_filter);
} else {
ret = i40e_sw_ethertype_filter_del(pf, &node->input);
}
diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index a4320b1..c392dc4 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -1595,8 +1595,15 @@ static int i40e_sw_fdir_filter_insert(struct i40e_pf *pf,
if (add) {
fdir_filter = rte_zmalloc("fdir_filter",
sizeof(*fdir_filter), 0);
+ if (fdir_filter == NULL) {
+ PMD_DRV_LOG(ERR, "Failed to alloc memory.");
+ return -ENOMEM;
+ }
+
rte_memcpy(fdir_filter, &check_filter, sizeof(check_filter));
ret = i40e_sw_fdir_filter_insert(pf, fdir_filter);
+ if (ret < 0)
+ rte_free(fdir_filter);
} else {
ret = i40e_sw_fdir_filter_del(pf, &node->fdir.input);
}
--
1.8.3.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-dev] [PATCH v4] net/i40e: add null point check and fix mem leak
2018-01-25 9:01 [dpdk-dev] [PATCH v4] net/i40e: add null point check and fix mem leak Yong Wang
@ 2018-01-26 4:57 ` Xing, Beilei
2018-01-26 9:37 ` Zhang, Helin
0 siblings, 1 reply; 3+ messages in thread
From: Xing, Beilei @ 2018-01-26 4:57 UTC (permalink / raw)
To: Yong Wang; +Cc: dev
> -----Original Message-----
> From: Yong Wang [mailto:wang.yong19@zte.com.cn]
> Sent: Thursday, January 25, 2018 5:01 PM
> To: Xing, Beilei <beilei.xing@intel.com>
> Cc: dev@dpdk.org; Yong Wang <wang.yong19@zte.com.cn>
> Subject: [PATCH v4] net/i40e: add null point check and fix mem leak
>
> There are several func calls to rte_zmalloc() which don't do null point check
> on the return value. And before return, the memory is not freed. Fix it by
> adding null point check and rte_free().
>
> Fixes: 078259773da9 ("net/i40e: store ethertype filter")
> Fixes: 425c3325f0b0 ("net/i40e: store tunnel filter")
> Fixes: c50474f31efe ("net/i40e: support tunnel filter to VF")
> Fixes: 5c53c82c8174 ("net/i40e: store flow director filter")
>
> Signed-off-by: Yong Wang <wang.yong19@zte.com.cn>
Acked-by: Beilei Xing <beilei.xing@intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-dev] [PATCH v4] net/i40e: add null point check and fix mem leak
2018-01-26 4:57 ` Xing, Beilei
@ 2018-01-26 9:37 ` Zhang, Helin
0 siblings, 0 replies; 3+ messages in thread
From: Zhang, Helin @ 2018-01-26 9:37 UTC (permalink / raw)
To: Xing, Beilei, Yong Wang; +Cc: dev
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Xing, Beilei
> Sent: Friday, January 26, 2018 12:58 PM
> To: Yong Wang
> Cc: dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v4] net/i40e: add null point check and fix mem
> leak
>
> > -----Original Message-----
> > From: Yong Wang [mailto:wang.yong19@zte.com.cn]
> > Sent: Thursday, January 25, 2018 5:01 PM
> > To: Xing, Beilei <beilei.xing@intel.com>
> > Cc: dev@dpdk.org; Yong Wang <wang.yong19@zte.com.cn>
> > Subject: [PATCH v4] net/i40e: add null point check and fix mem leak
> >
> > There are several func calls to rte_zmalloc() which don't do null
> > point check on the return value. And before return, the memory is not
> > freed. Fix it by adding null point check and rte_free().
> >
> > Fixes: 078259773da9 ("net/i40e: store ethertype filter")
> > Fixes: 425c3325f0b0 ("net/i40e: store tunnel filter")
> > Fixes: c50474f31efe ("net/i40e: support tunnel filter to VF")
> > Fixes: 5c53c82c8174 ("net/i40e: store flow director filter")
> >
> > Signed-off-by: Yong Wang <wang.yong19@zte.com.cn>
>
> Acked-by: Beilei Xing <beilei.xing@intel.com>
Applied to dpdk-next-net-intel, with commit log changes. Thanks!
/Helin
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-01-26 9:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-25 9:01 [dpdk-dev] [PATCH v4] net/i40e: add null point check and fix mem leak Yong Wang
2018-01-26 4:57 ` Xing, Beilei
2018-01-26 9:37 ` Zhang, Helin
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).