* [dpdk-dev] [PATCH v4] net/e1000: add null point check for rte_zmalloc
@ 2018-01-25 7:43 Yong Wang
2018-01-26 8:41 ` Lu, Wenzhuo
0 siblings, 1 reply; 3+ messages in thread
From: Yong Wang @ 2018-01-25 7:43 UTC (permalink / raw)
To: wenzhuo.lu; +Cc: dev, Yong Wang
There are several func calls to rte_zmalloc() which don't do null
point check on the return value. Fix it by adding null point check.
Fixes: 22bb13410cb2 ("net/igb: create consistent 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/e1000/igb_flow.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/drivers/net/e1000/igb_flow.c b/drivers/net/e1000/igb_flow.c
index d98bdc8..a142759 100644
--- a/drivers/net/e1000/igb_flow.c
+++ b/drivers/net/e1000/igb_flow.c
@@ -1413,6 +1413,11 @@
if (!ret) {
ntuple_filter_ptr = rte_zmalloc("igb_ntuple_filter",
sizeof(struct igb_ntuple_filter_ele), 0);
+ if (!ntuple_filter_ptr) {
+ PMD_DRV_LOG(ERR, "failed to allocate memory");
+ goto out;
+ }
+
rte_memcpy(&ntuple_filter_ptr->filter_info,
&ntuple_filter,
sizeof(struct rte_eth_ntuple_filter));
@@ -1435,6 +1440,11 @@
ethertype_filter_ptr = rte_zmalloc(
"igb_ethertype_filter",
sizeof(struct igb_ethertype_filter_ele), 0);
+ if (!ethertype_filter_ptr) {
+ PMD_DRV_LOG(ERR, "failed to allocate memory");
+ goto out;
+ }
+
rte_memcpy(ðertype_filter_ptr->filter_info,
ðertype_filter,
sizeof(struct rte_eth_ethertype_filter));
@@ -1455,6 +1465,11 @@
if (!ret) {
syn_filter_ptr = rte_zmalloc("igb_syn_filter",
sizeof(struct igb_eth_syn_filter_ele), 0);
+ if (!syn_filter_ptr) {
+ PMD_DRV_LOG(ERR, "failed to allocate memory");
+ goto out;
+ }
+
rte_memcpy(&syn_filter_ptr->filter_info,
&syn_filter,
sizeof(struct rte_eth_syn_filter));
@@ -1476,6 +1491,11 @@
if (!ret) {
flex_filter_ptr = rte_zmalloc("igb_flex_filter",
sizeof(struct igb_flex_filter_ele), 0);
+ if (!flex_filter_ptr) {
+ PMD_DRV_LOG(ERR, "failed to allocate memory");
+ goto out;
+ }
+
rte_memcpy(&flex_filter_ptr->filter_info,
&flex_filter,
sizeof(struct rte_eth_flex_filter));
--
1.8.3.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-dev] [PATCH v4] net/e1000: add null point check for rte_zmalloc
2018-01-25 7:43 [dpdk-dev] [PATCH v4] net/e1000: add null point check for rte_zmalloc Yong Wang
@ 2018-01-26 8:41 ` Lu, Wenzhuo
2018-01-26 9:30 ` Zhang, Helin
0 siblings, 1 reply; 3+ messages in thread
From: Lu, Wenzhuo @ 2018-01-26 8:41 UTC (permalink / raw)
To: Yong Wang; +Cc: dev
Hi,
> -----Original Message-----
> From: Yong Wang [mailto:wang.yong19@zte.com.cn]
> Sent: Thursday, January 25, 2018 3:43 PM
> To: Lu, Wenzhuo <wenzhuo.lu@intel.com>
> Cc: dev@dpdk.org; Yong Wang <wang.yong19@zte.com.cn>
> Subject: [PATCH v4] net/e1000: add null point check for rte_zmalloc
>
> There are several func calls to rte_zmalloc() which don't do null point check
> on the return value. Fix it by adding null point check.
>
> Fixes: 22bb13410cb2 ("net/igb: create consistent filter")
>
> Signed-off-by: Yong Wang <wang.yong19@zte.com.cn>
Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-dev] [PATCH v4] net/e1000: add null point check for rte_zmalloc
2018-01-26 8:41 ` Lu, Wenzhuo
@ 2018-01-26 9:30 ` Zhang, Helin
0 siblings, 0 replies; 3+ messages in thread
From: Zhang, Helin @ 2018-01-26 9:30 UTC (permalink / raw)
To: Lu, Wenzhuo, Yong Wang; +Cc: dev
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Lu, Wenzhuo
> Sent: Friday, January 26, 2018 4:41 PM
> To: Yong Wang
> Cc: dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v4] net/e1000: add null point check for
> rte_zmalloc
>
> Hi,
>
>
> > -----Original Message-----
> > From: Yong Wang [mailto:wang.yong19@zte.com.cn]
> > Sent: Thursday, January 25, 2018 3:43 PM
> > To: Lu, Wenzhuo <wenzhuo.lu@intel.com>
> > Cc: dev@dpdk.org; Yong Wang <wang.yong19@zte.com.cn>
> > Subject: [PATCH v4] net/e1000: add null point check for rte_zmalloc
> >
> > There are several func calls to rte_zmalloc() which don't do null
> > point check on the return value. Fix it by adding null point check.
> >
> > Fixes: 22bb13410cb2 ("net/igb: create consistent filter")
> >
> > Signed-off-by: Yong Wang <wang.yong19@zte.com.cn>
> Acked-by: Wenzhuo Lu <wenzhuo.lu@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:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-25 7:43 [dpdk-dev] [PATCH v4] net/e1000: add null point check for rte_zmalloc Yong Wang
2018-01-26 8:41 ` Lu, Wenzhuo
2018-01-26 9:30 ` 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).