From: "Jiawen Wu" <jiawenwu@trustnetic.com>
To: "'Ferruh Yigit'" <ferruh.yigit@intel.com>,
"'Min Hu \(Connor\)'" <humin29@huawei.com>
Cc: <dev@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH] net/txgbe: fix null pointer check problem
Date: Thu, 29 Apr 2021 11:35:02 +0800 [thread overview]
Message-ID: <008901d73ca8$a3e2efd0$eba8cf70$@trustnetic.com> (raw)
In-Reply-To: <57d60499-2ff9-fe16-aa97-93deb6e2cdc6@intel.com>
On April 27, 2021 11:31 PM, Ferruh Yigit wrote:
> On 4/25/2021 1:54 PM, Min Hu (Connor) wrote:
> > From: HongBo Zheng <zhenghongbo3@huawei.com>
> >
> > In function cons_parse_ntuple_filter, item->spec and item->mask should
> > be confirmed not null before use memcmp on it, current judgement
> > (item->spec || item->mask) just can confirm item->spec or item->mask
> > is not null, and cause null pointer be used in memcmp.
> >
> > This patch fix this problem.
> >
> > Fixes: b7eeecb17556 ("net/txgbe: parse n-tuple filter")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: HongBo Zheng <zhenghongbo3@huawei.com>
> > Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
> > ---
> > drivers/net/txgbe/txgbe_flow.c | 18 ++++++++----------
> > 1 file changed, 8 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/net/txgbe/txgbe_flow.c
> > b/drivers/net/txgbe/txgbe_flow.c index 57a4f2e..35026ee 100644
> > --- a/drivers/net/txgbe/txgbe_flow.c
> > +++ b/drivers/net/txgbe/txgbe_flow.c
> > @@ -240,11 +240,10 @@ cons_parse_ntuple_filter(const struct
> rte_flow_attr *attr,
> > return -rte_errno;
> > }
> > /* if the first item is MAC, the content should be NULL */
> > - if ((item->spec || item->mask) &&
> > - (memcmp(eth_spec, ð_null,
> > - sizeof(struct rte_flow_item_eth)) ||
> > - memcmp(eth_mask, ð_null,
> > - sizeof(struct rte_flow_item_eth)))) {
> > + if ((item->spec && memcmp(eth_spec, ð_null,
> > + sizeof(struct rte_flow_item_eth))) ||
> > + (item->mask && memcmp(eth_mask, ð_null,
> > + sizeof(struct rte_flow_item_eth)))) {
> > rte_flow_error_set(error, EINVAL,
> > RTE_FLOW_ERROR_TYPE_ITEM,
> > item, "Not supported by ntuple filter"); @@ -272,11
> +271,10 @@
> > cons_parse_ntuple_filter(const struct rte_flow_attr *attr,
> > return -rte_errno;
> > }
> > /* the content should be NULL */
> > - if ((item->spec || item->mask) &&
> > - (memcmp(vlan_spec, &vlan_null,
> > - sizeof(struct rte_flow_item_vlan)) ||
> > - memcmp(vlan_mask, &vlan_null,
> > - sizeof(struct rte_flow_item_vlan)))) {
> > + if ((item->spec && memcmp(vlan_spec, &vlan_null,
> > + sizeof(struct rte_flow_item_vlan))) ||
> > + (item->mask && memcmp(vlan_mask, &vlan_null,
> > + sizeof(struct rte_flow_item_vlan)))) {
> > rte_flow_error_set(error, EINVAL,
> > RTE_FLOW_ERROR_TYPE_ITEM,
> > item, "Not supported by ntuple filter");
> >
>
> Looks good to me, but lets wait or maintainers review.
Thanks.
Acked-by: Jiawen Wu <jiawenwu@trustnetic.com>
next prev parent reply other threads:[~2021-04-29 3:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-25 12:54 Min Hu (Connor)
2021-04-27 15:30 ` Ferruh Yigit
2021-04-29 3:35 ` Jiawen Wu [this message]
2021-04-29 13:12 ` Ferruh Yigit
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='008901d73ca8$a3e2efd0$eba8cf70$@trustnetic.com' \
--to=jiawenwu@trustnetic.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=humin29@huawei.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).