[dpdk-stable] patch 'net/ice: fix illegal access when removing MAC filter' has been queued to stable release 19.11.9

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.9

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/19/21. 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.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/53c519355d8134504051f31c04821e9b19bd29eb

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 53c519355d8134504051f31c04821e9b19bd29eb Mon Sep 17 00:00:00 2001
From: Wenwu Ma <wenwux.ma at intel.com>
Date: Fri, 2 Apr 2021 13:52:47 +0000
Subject: [PATCH] net/ice: fix illegal access when removing MAC filter

[ upstream commit f4b6eb2b91f38dc9ebc6c4e2b913fd1d25f14773 ]

When removing the mac filter in ice_remove_all_mac_vlan_filters(),
TAILQ_FOREACH_SAFE should be used instead of TAILQ_FOREACH,
Otherwise, it will result in a illegal pointer access.

Fixes: e0dcf94a0d7f ("net/ice: support VLAN ops")

Signed-off-by: Wenwu Ma <wenwux.ma at intel.com>
Tested-by: Zhihong Peng <zhihongx.peng at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_ethdev.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 00a6c7bcb3..7227d2182e 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -10,6 +10,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <rte_tailq.h>
+
 #include "base/ice_sched.h"
 #include "base/ice_flow.h"
 #include "base/ice_dcb.h"
@@ -1078,12 +1080,13 @@ ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi)
 {
 	struct ice_mac_filter *m_f;
 	struct ice_vlan_filter *v_f;
+	void *temp;
 	int ret = 0;
 
 	if (!vsi || !vsi->mac_num)
 		return -EINVAL;
 
-	TAILQ_FOREACH(m_f, &vsi->mac_list, next) {
+	TAILQ_FOREACH_SAFE(m_f, &vsi->mac_list, next, temp) {
 		ret = ice_remove_mac_filter(vsi, &m_f->mac_info.mac_addr);
 		if (ret != ICE_SUCCESS) {
 			ret = -EINVAL;
@@ -1094,7 +1097,7 @@ ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi)
 	if (vsi->vlan_num == 0)
 		return 0;
 
-	TAILQ_FOREACH(v_f, &vsi->vlan_list, next) {
+	TAILQ_FOREACH_SAFE(v_f, &vsi->vlan_list, next) {
 		ret = ice_remove_vlan_filter(vsi, v_f->vlan_info.vlan_id);
 		if (ret != ICE_SUCCESS) {
 			ret = -EINVAL;
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-17 17:40:33.737105269 +0200
+++ 0110-net-ice-fix-illegal-access-when-removing-MAC-filter.patch	2021-05-17 17:40:29.315810609 +0200
@@ -1 +1 @@
-From f4b6eb2b91f38dc9ebc6c4e2b913fd1d25f14773 Mon Sep 17 00:00:00 2001
+From 53c519355d8134504051f31c04821e9b19bd29eb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f4b6eb2b91f38dc9ebc6c4e2b913fd1d25f14773 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index a1365131e0..84d1735255 100644
+index 00a6c7bcb3..7227d2182e 100644
@@ -33 +34 @@
-@@ -1092,12 +1094,13 @@ ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi)
+@@ -1078,12 +1080,13 @@ ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi)
@@ -48 +49 @@
-@@ -1108,7 +1111,7 @@ ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi)
+@@ -1094,7 +1097,7 @@ ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi)
@@ -53,2 +54,2 @@
-+	TAILQ_FOREACH_SAFE(v_f, &vsi->vlan_list, next, temp) {
- 		ret = ice_remove_vlan_filter(vsi, &v_f->vlan_info.vlan);
++	TAILQ_FOREACH_SAFE(v_f, &vsi->vlan_list, next) {
+ 		ret = ice_remove_vlan_filter(vsi, v_f->vlan_info.vlan_id);