net/ice: fix pattern check in flow director

Mask for IPv4/UDP/TCP/SCTP addr/port are not supported in current
code. Thus we need to check each pattern mask. Only zero-mask and
full-mask are allowed to pass the pattern parse, otherwise will
return failure.

Fixes: a631c98a96a2 ("net/ice: fix pattern check for flow director parser")
Cc: stable@dpdk.org

Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
This commit is contained in:
Junfeng Guo 2022-02-08 15:09:25 +08:00 committed by Qi Zhang
parent 92317961a7
commit 01b8739f47

View File

@ -2036,10 +2036,10 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,
}
/* Mask for IPv4 src/dst addrs not supported */
if (!ipv4_mask->hdr.src_addr &&
if (ipv4_mask->hdr.src_addr &&
ipv4_mask->hdr.src_addr != UINT32_MAX)
return -rte_errno;
if (!ipv4_mask->hdr.dst_addr &&
if (ipv4_mask->hdr.dst_addr &&
ipv4_mask->hdr.dst_addr != UINT32_MAX)
return -rte_errno;
@ -2185,10 +2185,10 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,
}
/* Mask for TCP src/dst ports not supported */
if (!tcp_mask->hdr.src_port &&
if (tcp_mask->hdr.src_port &&
tcp_mask->hdr.src_port != UINT16_MAX)
return -rte_errno;
if (!tcp_mask->hdr.dst_port &&
if (tcp_mask->hdr.dst_port &&
tcp_mask->hdr.dst_port != UINT16_MAX)
return -rte_errno;
@ -2232,10 +2232,10 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,
}
/* Mask for UDP src/dst ports not supported */
if (!udp_mask->hdr.src_port &&
if (udp_mask->hdr.src_port &&
udp_mask->hdr.src_port != UINT16_MAX)
return -rte_errno;
if (!udp_mask->hdr.dst_port &&
if (udp_mask->hdr.dst_port &&
udp_mask->hdr.dst_port != UINT16_MAX)
return -rte_errno;
@ -2277,10 +2277,10 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,
}
/* Mask for SCTP src/dst ports not supported */
if (!sctp_mask->hdr.src_port &&
if (sctp_mask->hdr.src_port &&
sctp_mask->hdr.src_port != UINT16_MAX)
return -rte_errno;
if (!sctp_mask->hdr.dst_port &&
if (sctp_mask->hdr.dst_port &&
sctp_mask->hdr.dst_port != UINT16_MAX)
return -rte_errno;