* [dpdk-dev] [PATCH] net/ice: fix full mask issue for ACL rule
@ 2020-11-11 11:30 Simei Su
2020-11-11 12:37 ` Zhang, Qi Z
0 siblings, 1 reply; 2+ messages in thread
From: Simei Su @ 2020-11-11 11:30 UTC (permalink / raw)
To: qi.z.zhang; +Cc: dev, beilei.xing, xuan.ding, Simei Su
A rule with an imperfect match(wildcarding) will be routed through
ACL. A perfect match should be rejected by ACL.
Fixes: 40d466fa9f76 ("net/ice: support ACL filter in DCF")
Signed-off-by: Simei Su <simei.su@intel.com>
---
drivers/net/ice/ice_acl_filter.c | 44 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/drivers/net/ice/ice_acl_filter.c b/drivers/net/ice/ice_acl_filter.c
index 8ca88d2..f7dbe53 100644
--- a/drivers/net/ice/ice_acl_filter.c
+++ b/drivers/net/ice/ice_acl_filter.c
@@ -664,6 +664,14 @@ ice_acl_parse_pattern(__rte_unused struct ice_adapter *ad,
eth_mask = item->mask;
if (eth_spec && eth_mask) {
+ if (rte_is_broadcast_ether_addr(ð_mask->src) ||
+ rte_is_broadcast_ether_addr(ð_mask->dst)) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item, "Invalid mac addr mask");
+ return -rte_errno;
+ }
+
if (!rte_is_zero_ether_addr(ð_spec->src) &&
!rte_is_zero_ether_addr(ð_mask->src)) {
input_set |= ICE_INSET_SMAC;
@@ -710,6 +718,15 @@ ice_acl_parse_pattern(__rte_unused struct ice_adapter *ad,
return -rte_errno;
}
+ if (ipv4_mask->hdr.src_addr == UINT32_MAX ||
+ ipv4_mask->hdr.dst_addr == UINT32_MAX) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "Invalid IPv4 mask.");
+ return -rte_errno;
+ }
+
if (ipv4_mask->hdr.src_addr) {
filter->input.ip.v4.src_ip =
ipv4_spec->hdr.src_addr;
@@ -754,6 +771,15 @@ ice_acl_parse_pattern(__rte_unused struct ice_adapter *ad,
return -rte_errno;
}
+ if (tcp_mask->hdr.src_port == UINT16_MAX ||
+ tcp_mask->hdr.dst_port == UINT16_MAX) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "Invalid TCP mask");
+ return -rte_errno;
+ }
+
if (l3 == RTE_FLOW_ITEM_TYPE_IPV4 &&
tcp_mask->hdr.src_port) {
input_set |= ICE_INSET_TCP_SRC_PORT;
@@ -791,6 +817,15 @@ ice_acl_parse_pattern(__rte_unused struct ice_adapter *ad,
return -rte_errno;
}
+ if (udp_mask->hdr.src_port == UINT16_MAX ||
+ udp_mask->hdr.dst_port == UINT16_MAX) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "Invalid UDP mask");
+ return -rte_errno;
+ }
+
if (l3 == RTE_FLOW_ITEM_TYPE_IPV4 &&
udp_mask->hdr.src_port) {
input_set |= ICE_INSET_UDP_SRC_PORT;
@@ -818,6 +853,15 @@ ice_acl_parse_pattern(__rte_unused struct ice_adapter *ad,
flow_type = ICE_FLTR_PTYPE_NONF_IPV4_SCTP;
if (sctp_spec && sctp_mask) {
+ if (sctp_mask->hdr.src_port == UINT16_MAX ||
+ sctp_mask->hdr.dst_port == UINT16_MAX) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "Invalid SCTP mask");
+ return -rte_errno;
+ }
+
if (l3 == RTE_FLOW_ITEM_TYPE_IPV4 &&
sctp_mask->hdr.src_port) {
input_set |= ICE_INSET_SCTP_SRC_PORT;
--
2.9.5
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [dpdk-dev] [PATCH] net/ice: fix full mask issue for ACL rule
2020-11-11 11:30 [dpdk-dev] [PATCH] net/ice: fix full mask issue for ACL rule Simei Su
@ 2020-11-11 12:37 ` Zhang, Qi Z
0 siblings, 0 replies; 2+ messages in thread
From: Zhang, Qi Z @ 2020-11-11 12:37 UTC (permalink / raw)
To: Su, Simei; +Cc: dev, Xing, Beilei, Ding, Xuan
> -----Original Message-----
> From: Su, Simei <simei.su@intel.com>
> Sent: Wednesday, November 11, 2020 7:30 PM
> To: Zhang, Qi Z <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; Xing, Beilei <beilei.xing@intel.com>; Ding, Xuan
> <xuan.ding@intel.com>; Su, Simei <simei.su@intel.com>
> Subject: [PATCH] net/ice: fix full mask issue for ACL rule
>
> A rule with an imperfect match(wildcarding) will be routed through ACL. A
> perfect match should be rejected by ACL.
>
> Fixes: 40d466fa9f76 ("net/ice: support ACL filter in DCF")
>
> Signed-off-by: Simei Su <simei.su@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-11 12:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-11 11:30 [dpdk-dev] [PATCH] net/ice: fix full mask issue for ACL rule Simei Su
2020-11-11 12:37 ` Zhang, Qi Z
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).