Skip to contentSkip to conversation

net/mlx5: fix refuse empty VLAN validation

PATCH In review Shiri Kuzin 2 participants 2 messages Jan 19, 2021 – Jan 24, 2021 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/mlx5: fix refuse empty VLAN validation

In verbs, an empty VLAN is equivalent to a packet without VLAN layer, hence, the VLAN item should not be empty and this case is rejected.

However, the case for ether type of VLAN without following VLAN item was not validated, allowing the creation of a flow with empty VLAN item.

To fix this issue a validation was added requiring ether type of VLAN will be followed with VLAN item.

Fixes 0b1edd21cd78 ("net/mlx5: refuse empty VLAN flow specification")
---
 drivers/net/mlx5/mlx5_flow_verbs.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/net/mlx5/mlx5_flow_verbs.c +8 -0
index 2d4381946d..827d2ecf9d 100644
@@ -1253,6 +1253,7 @@ flow_verbs_validate(struct rte_eth_dev *dev,
 	uint64_t last_item = 0;
 	uint8_t next_protocol = 0xff;
 	uint16_t ether_type = 0;
+	bool is_empty_vlan = false;
 
 	if (items == NULL)
 		return -1;
@@ -1280,6 +1281,8 @@ flow_verbs_validate(struct rte_eth_dev *dev,
 				ether_type &=
 					((const struct rte_flow_item_eth *)
 					 items->mask)->type;
+				if (ether_type == RTE_BE16(RTE_ETHER_TYPE_VLAN))
+					is_empty_vlan = true;
 				ether_type = rte_be_to_cpu_16(ether_type);
 			} else {
 				ether_type = 0;
@@ -1305,6 +1308,7 @@ flow_verbs_validate(struct rte_eth_dev *dev,
 			} else {
 				ether_type = 0;
 			}
+			is_empty_vlan = false;
 			break;
 		case RTE_FLOW_ITEM_TYPE_IPV4:
 			ret = mlx5_flow_validate_item_ipv4
@@ -1416,6 +1420,10 @@ flow_verbs_validate(struct rte_eth_dev *dev,
 		}
 		item_flags |= last_item;
 	}
+	if (is_empty_vlan)
+		return rte_flow_error_set(error, ENOTSUP,
+						 RTE_FLOW_ERROR_TYPE_ITEM, NULL,
+		    "VLAN matching without vid specification is not supported");
 	for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
 		switch (actions->type) {
 		case RTE_FLOW_ACTION_TYPE_VOID:
Signature · 1 line
2.21.0
#1 lore raw

Hi,

Quoted 19 lines

-----Original Message-----
From: Shiri Kuzin <[email protected]>
Sent: Tuesday, January 19, 2021 7:07 PM
To: [email protected]
Cc: Matan Azrad <[email protected]>; Slava Ovsiienko <[email protected]>; Shahaf Shuler <[email protected]>; Raslan Darawsheh <[email protected]>; [email protected]
Subject: [PATCH] net/mlx5: fix refuse empty VLAN validation

In verbs, an empty VLAN is equivalent to a packet without VLAN layer, hence, the VLAN item should not be empty and this case is rejected.

However, the case for ether type of VLAN without following VLAN item was not validated, allowing the creation of a flow with empty VLAN item.

To fix this issue a validation was added requiring ether type of VLAN will be followed with VLAN item.

Quoted 6 lines
Fixes 0b1edd21cd78 ("net/mlx5: refuse empty VLAN flow specification")

---

Patch applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh