Re: [dpdk-dev] [PATCH] net/txgbe: fix null pointer check problem

[Jiawen Wu]

On April 27, 2021 11:31 PM, Ferruh Yigit wrote:
> On 4/25/2021 1:54 PM, Min Hu (Connor) wrote:
> > From: HongBo Zheng <zhenghong...@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: sta...@dpdk.org
> >
> > Signed-off-by: HongBo Zheng <zhenghong...@huawei.com>
> > Signed-off-by: Min Hu (Connor) <humi...@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, &eth_null,
> > -                           sizeof(struct rte_flow_item_eth)) ||
> > -                    memcmp(eth_mask, &eth_null,
> > -                           sizeof(struct rte_flow_item_eth)))) {
> > +           if ((item->spec && memcmp(eth_spec, &eth_null,
> > +                                     sizeof(struct rte_flow_item_eth))) ||
> > +               (item->mask && memcmp(eth_mask, &eth_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 <jiawe...@trustnetic.com>