[dpdk-stable] patch 'net/mlx5: fix VLAN flow action with wildcard VLAN item' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/24/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From a15ee3e4a71265479439da08a2880a50ae6fd634 Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at mellanox.com>
Date: Wed, 13 May 2020 22:49:19 +0300
Subject: [PATCH] net/mlx5: fix VLAN flow action with wildcard VLAN item

[ upstream commit ff55182ce3f04c8f8851dc52f1719c26e3f3a40f ]

Previous patch added support of VLAN item without VLAN ID value,
i.e. using wildcard VLAN item, to match VLAN with any VLAN ID.
The implication on VLAN actions was not taken into consideration.
VLAN actions (e.g. push vlan) use the VLAN ID value in the VLAN item,
and expect it to be valid.

This patch updates function flow_dev_get_vlan_info_from_items() to
check the VLAN item contents before trying to use it.

Fixes: 92818d839e8e ("net/mlx5: fix match on empty VLAN item in DV mode")

Signed-off-by: Dekel Peled <dekelp at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 9233853e1d..d83e49f954 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1728,6 +1728,9 @@ flow_dev_get_vlan_info_from_items(const struct rte_flow_item *items,
 		const struct rte_flow_item_vlan *vlan_m = items->mask;
 		const struct rte_flow_item_vlan *vlan_v = items->spec;
 
+		/* If VLAN item in pattern doesn't contain data, return here. */
+		if (!vlan_v)
+			return;
 		if (!vlan_m)
 			vlan_m = &nic_mask;
 		/* Only full match values are accepted */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-22 10:37:39.802053062 +0100
+++ 0015-net-mlx5-fix-VLAN-flow-action-with-wildcard-VLAN-ite.patch	2020-05-22 10:37:39.100412212 +0100
@@ -1,8 +1,10 @@
-From ff55182ce3f04c8f8851dc52f1719c26e3f3a40f Mon Sep 17 00:00:00 2001
+From a15ee3e4a71265479439da08a2880a50ae6fd634 Mon Sep 17 00:00:00 2001
 From: Dekel Peled <dekelp at mellanox.com>
 Date: Wed, 13 May 2020 22:49:19 +0300
 Subject: [PATCH] net/mlx5: fix VLAN flow action with wildcard VLAN item
 
+[ upstream commit ff55182ce3f04c8f8851dc52f1719c26e3f3a40f ]
+
 Previous patch added support of VLAN item without VLAN ID value,
 i.e. using wildcard VLAN item, to match VLAN with any VLAN ID.
 The implication on VLAN actions was not taken into consideration.
@@ -13,7 +15,6 @@
 check the VLAN item contents before trying to use it.
 
 Fixes: 92818d839e8e ("net/mlx5: fix match on empty VLAN item in DV mode")
-Cc: stable at dpdk.org
 
 Signed-off-by: Dekel Peled <dekelp at mellanox.com>
 Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
@@ -22,10 +23,10 @@
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
-index fd002f3c57..71da5fbefe 100644
+index 9233853e1d..d83e49f954 100644
 --- a/drivers/net/mlx5/mlx5_flow_dv.c
 +++ b/drivers/net/mlx5/mlx5_flow_dv.c
-@@ -1881,6 +1881,9 @@ flow_dev_get_vlan_info_from_items(const struct rte_flow_item *items,
+@@ -1728,6 +1728,9 @@ flow_dev_get_vlan_info_from_items(const struct rte_flow_item *items,
  		const struct rte_flow_item_vlan *vlan_m = items->mask;
  		const struct rte_flow_item_vlan *vlan_v = items->spec;