net: bcmgenet: fix mask check in bcmgenet_validate_flow()
Subsystems (4)
PATCH 1/1 net: bcmgenet: fix mask check in bcmgenet_validate_flow()
VALIDATE_MASK(eth_mask->h_source) is checked twice in a row in bcmgenet_validate_flow(). Add VALIDATE_MASK(eth_mask->h_dest) instead.
---
I'm not sure that h_dest check is required here, it's only my guess. Compile tested only.
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +1 -1
@@ -1364,7 +1364,7 @@ static int bcmgenet_validate_flow(struct net_device *dev,case ETHER_FLOW : eth_mask = &cmd->fs.m_u.ether_spec;/* don't allow mask which isn't valid */ -if (VALIDATE_MASK (eth_mask->h_source) || +if (VALIDATE_MASK (eth_mask->h_dest) ||VALIDATE_MASK (eth_mask->h_source) ||VALIDATE_MASK (eth_mask->h_proto)) {netdev_err (dev,"rxnfc: Unsupported mask\n" );
Signature · 1 line
2.26.2
Quoted 20 lines · Denis Efremov
VALIDATE_MASK(eth_mask->h_source)is checked twice in a row inbcmgenet_validate_flow(). AddVALIDATE_MASK(eth_mask->h_dest)instead.Fixes 3e370952287c ("net: bcmgenet: add support for ethtool rxnfc flows")Signed-off-by Denis Efremov <[email protected]>---
I'm not sure thath_destcheck is required here, it's only my guess. Compile tested only.drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/ethernet/broadcom/genet/bcmgenet.c +0
-0
drivers/net/ethernet/broadcom/genet/bcmgenet.c static int bcmgenet_validate_flow(struct net_device *dev, · line 1370
Quoted 8 lines
drivers/net/ethernet/broadcom/genet/bcmgenet.c +1
-1@@ -1364,7 +1364,7 @@ static int bcmgenet_validate_flow(struct net_device *dev,case ETHER_FLOW : eth_mask = &cmd->fs.m_u.ether_spec;/* don't allow mask which isn't valid */ -if (VALIDATE_MASK (eth_mask->h_source) || +if (VALIDATE_MASK (eth_mask->h_dest) ||VALIDATE_MASK (eth_mask->h_source) ||VALIDATE_MASK (eth_mask->h_proto)) {netdev_err (dev,"rxnfc: Unsupported mask\n" );
Well spotted. Thanks!
Quoted 7 lines · Denis Efremov
VALIDATE_MASK(eth_mask->h_source)is checked twice in a row inbcmgenet_validate_flow(). AddVALIDATE_MASK(eth_mask->h_dest)instead.Fixes 3e370952287c ("net: bcmgenet: add support for ethtool rxnfc flows")Signed-off-by Denis Efremov <[email protected]>
Signature · 1 line
Florian
David Miller
maintainerFrom: Denis Efremov <[email protected]>
Date: Wed, 2 Sep 2020 14:18:45 +0300
Quoted 7 lines
VALIDATE_MASK(eth_mask->h_source)is checked twice in a row inbcmgenet_validate_flow(). AddVALIDATE_MASK(eth_mask->h_dest)instead.Fixes 3e370952287c ("net: bcmgenet: add support for ethtool rxnfc flows")Signed-off-by Denis Efremov <[email protected]>
Please do not CC: stable for networking patches.
Applied and queued up for -stable, thank you.