[dpdk-stable] patch 'net/mlx5: fix ICMPv6 header rewrite action validation' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/29/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 6076d4d16c9e7d1168c8be8c4035d6fa076db498 Mon Sep 17 00:00:00 2001
From: Shiri Kuzin <shirik at mellanox.com>
Date: Tue, 18 Feb 2020 13:52:54 +0200
Subject: [PATCH] net/mlx5: fix ICMPv6 header rewrite action validation

[ upstream commit e649994972cda23fc777f45f7b40c528313543ed ]

ICMPv6 header contains the checksum field, that includes the IP
addresses from IP header.

The ConnectX-5 hardware does not support ICMPv6 checksum calculation
and in case of IP header modification the checksum will contain
the wrong value.

The patch rejects the header modification actions related to IP
addresses if ICMPv6 protocol is detected in pattern.
This issue was also partly fixed in commit below which rejects
flows with the pattern "ipv6 proto is 58".

Fixes: 0e2ceb639d8a ("net/mlx5: fix ICMPv6 header rewrite actions")

Signed-off-by: Shiri Kuzin <shirik at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
Acked-by: Matan Azrad <matan at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index cace0f31b5..7b5471b54a 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -4464,6 +4464,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 							    error);
 			if (ret < 0)
 				return ret;
+			item_ipv6_proto = IPPROTO_ICMPV6;
 			last_item = MLX5_FLOW_LAYER_ICMP6;
 			break;
 		case RTE_FLOW_ITEM_TYPE_TAG:
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-27 09:31:56.326220026 +0000
+++ 0015-net-mlx5-fix-ICMPv6-header-rewrite-action-validation.patch	2020-02-27 09:31:55.711945697 +0000
@@ -1,8 +1,10 @@
-From e649994972cda23fc777f45f7b40c528313543ed Mon Sep 17 00:00:00 2001
+From 6076d4d16c9e7d1168c8be8c4035d6fa076db498 Mon Sep 17 00:00:00 2001
 From: Shiri Kuzin <shirik at mellanox.com>
 Date: Tue, 18 Feb 2020 13:52:54 +0200
 Subject: [PATCH] net/mlx5: fix ICMPv6 header rewrite action validation
 
+[ upstream commit e649994972cda23fc777f45f7b40c528313543ed ]
+
 ICMPv6 header contains the checksum field, that includes the IP
 addresses from IP header.
 
@@ -16,7 +18,6 @@
 flows with the pattern "ipv6 proto is 58".
 
 Fixes: 0e2ceb639d8a ("net/mlx5: fix ICMPv6 header rewrite actions")
-Cc: stable at dpdk.org
 
 Signed-off-by: Shiri Kuzin <shirik at mellanox.com>
 Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
@@ -26,10 +27,10 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
-index 341d51152a..1c01269117 100644
+index cace0f31b5..7b5471b54a 100644
 --- a/drivers/net/mlx5/mlx5_flow_dv.c
 +++ b/drivers/net/mlx5/mlx5_flow_dv.c
-@@ -4621,6 +4621,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+@@ -4464,6 +4464,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
  							    error);
  			if (ret < 0)
  				return ret;