net/bnxt: fix MAC address check in flow validation

Add another check to flag zero mac address while validating/parsing
the flow arguments

Fixes: 4072448003 ("net/bnxt: allow only unicast MAC address filter creation")

Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>
This commit is contained in:
Somnath Kotur 2019-10-24 13:14:26 +05:30 committed by Ferruh Yigit
parent bd94753fc7
commit 26f044cebd

View File

@ -136,6 +136,7 @@ bnxt_validate_and_parse_flow_type(struct bnxt *bp,
const struct rte_flow_item_tcp *tcp_spec, *tcp_mask; const struct rte_flow_item_tcp *tcp_spec, *tcp_mask;
const struct rte_flow_item_udp *udp_spec, *udp_mask; const struct rte_flow_item_udp *udp_spec, *udp_mask;
const struct rte_flow_item_eth *eth_spec, *eth_mask; const struct rte_flow_item_eth *eth_spec, *eth_mask;
const struct rte_ether_addr *dst, *src;
const struct rte_flow_item_nvgre *nvgre_spec; const struct rte_flow_item_nvgre *nvgre_spec;
const struct rte_flow_item_nvgre *nvgre_mask; const struct rte_flow_item_nvgre *nvgre_mask;
const struct rte_flow_item_gre *gre_spec; const struct rte_flow_item_gre *gre_spec;
@ -226,12 +227,15 @@ bnxt_validate_and_parse_flow_type(struct bnxt *bp,
} }
if (rte_is_broadcast_ether_addr(&eth_mask->dst)) { if (rte_is_broadcast_ether_addr(&eth_mask->dst)) {
if (!rte_is_unicast_ether_addr(&eth_spec->dst)) { dst = &eth_spec->dst;
if (!rte_is_valid_assigned_ether_addr(dst)) {
rte_flow_error_set(error, rte_flow_error_set(error,
EINVAL, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM, RTE_FLOW_ERROR_TYPE_ITEM,
item, item,
"DMAC is invalid"); "DMAC is invalid");
PMD_DRV_LOG(ERR,
"DMAC is invalid!\n");
return -rte_errno; return -rte_errno;
} }
rte_memcpy(filter->dst_macaddr, rte_memcpy(filter->dst_macaddr,
@ -246,14 +250,16 @@ bnxt_validate_and_parse_flow_type(struct bnxt *bp,
PMD_DRV_LOG(DEBUG, PMD_DRV_LOG(DEBUG,
"Creating a priority flow\n"); "Creating a priority flow\n");
} }
if (rte_is_broadcast_ether_addr(&eth_mask->src)) { if (rte_is_broadcast_ether_addr(&eth_mask->src)) {
if (!rte_is_unicast_ether_addr(&eth_spec->src)) { src = &eth_spec->src;
if (!rte_is_valid_assigned_ether_addr(src)) {
rte_flow_error_set(error, rte_flow_error_set(error,
EINVAL, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM, RTE_FLOW_ERROR_TYPE_ITEM,
item, item,
"SMAC is invalid"); "SMAC is invalid");
PMD_DRV_LOG(ERR,
"SMAC is invalid!\n");
return -rte_errno; return -rte_errno;
} }
rte_memcpy(filter->src_macaddr, rte_memcpy(filter->src_macaddr,