Skip to contentSkip to conversation

net: bcmgenet: fix mask check in bcmgenet_validate_flow()

PATCH In review Denis Efremov 4 participants 4 messages Sep 2, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

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.

Fixes 3e370952287c ("net: bcmgenet: add support for ethtool rxnfc flows")

---
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
index 0ca8436d2e9d..be85dad2e3bc 100644
@@ -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
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 20 lines · Denis Efremov

VALIDATE_MASK(eth_mask->h_source) is checked twice in a row in bcmgenet_validate_flow(). Add VALIDATE_MASK(eth_mask->h_dest) instead.

Fixes 3e370952287c ("net: bcmgenet: add support for ethtool rxnfc flows")

---
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 +0 -0
index 0ca8436d2e9d..be85dad2e3bc 100644

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!

maintainer
#3 lore raw
In reply to Denis Efremov

From: 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 in bcmgenet_validate_flow(). Add VALIDATE_MASK(eth_mask->h_dest) instead.

Fixes 3e370952287c ("net: bcmgenet: add support for ethtool rxnfc flows")

Please do not CC: stable for networking patches.

Applied and queued up for -stable, thank you.