* [dpdk-dev] [PATCH] net/txgbe: fix null pointer check problem
@ 2021-04-25 12:54 Min Hu (Connor)
2021-04-27 15:30 ` Ferruh Yigit
0 siblings, 1 reply; 4+ messages in thread
From: Min Hu (Connor) @ 2021-04-25 12:54 UTC (permalink / raw)
To: dev; +Cc: ferruh.yigit, jiawenwu, jianwang
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");
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [dpdk-dev] [PATCH] net/txgbe: fix null pointer check problem
2021-04-25 12:54 [dpdk-dev] [PATCH] net/txgbe: fix null pointer check problem Min Hu (Connor)
@ 2021-04-27 15:30 ` Ferruh Yigit
2021-04-29 3:35 ` Jiawen Wu
0 siblings, 1 reply; 4+ messages in thread
From: Ferruh Yigit @ 2021-04-27 15:30 UTC (permalink / raw)
To: Min Hu (Connor), jiawenwu, jianwang; +Cc: dev
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-dev] [PATCH] net/txgbe: fix null pointer check problem
2021-04-27 15:30 ` Ferruh Yigit
@ 2021-04-29 3:35 ` Jiawen Wu
2021-04-29 13:12 ` Ferruh Yigit
0 siblings, 1 reply; 4+ messages in thread
From: Jiawen Wu @ 2021-04-29 3:35 UTC (permalink / raw)
To: 'Ferruh Yigit', 'Min Hu (Connor)'; +Cc: dev
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>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-dev] [PATCH] net/txgbe: fix null pointer check problem
2021-04-29 3:35 ` Jiawen Wu
@ 2021-04-29 13:12 ` Ferruh Yigit
0 siblings, 0 replies; 4+ messages in thread
From: Ferruh Yigit @ 2021-04-29 13:12 UTC (permalink / raw)
To: Jiawen Wu, 'Min Hu (Connor)'; +Cc: dev
On 4/29/2021 4:35 AM, Jiawen Wu wrote:
> 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>
>
Applied to dpdk-next-net/main, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-29 13:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-25 12:54 [dpdk-dev] [PATCH] net/txgbe: fix null pointer check problem Min Hu (Connor)
2021-04-27 15:30 ` Ferruh Yigit
2021-04-29 3:35 ` Jiawen Wu
2021-04-29 13:12 ` Ferruh Yigit
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.