[dpdk-stable] patch 'net/mvpp2: fix stack corruption' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

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/06/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/abaa646aa09bd6fffb87611da6d2fdf2dc6f7c5c

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From abaa646aa09bd6fffb87611da6d2fdf2dc6f7c5c Mon Sep 17 00:00:00 2001
From: Yuri Chipchev <yuric at marvell.com>
Date: Wed, 27 Jan 2021 18:09:15 +0200
Subject: [PATCH] net/mvpp2: fix stack corruption

[ upstream commit 8ce3c5db531eaf339ed60fb0ef97eab05c77846b ]

Fixes stack corruption in mrvl_fill_bpool function
in case num > MRVL_PP2_RXD_MAX

Fixes: c3637258d894 ("net/mrvl: fix Rx descriptors number")

Signed-off-by: Yuri Chipchev <yuric at marvell.com>
Reviewed-by: Liron Himi <lironh at marvell.com>
---
 drivers/net/mvpp2/mrvl_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index 9037274327..6c9c5ef2f2 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -1611,8 +1611,8 @@ mrvl_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
 static int
 mrvl_fill_bpool(struct mrvl_rxq *rxq, int num)
 {
-	struct buff_release_entry entries[MRVL_PP2_RXD_MAX];
-	struct rte_mbuf *mbufs[MRVL_PP2_RXD_MAX];
+	struct buff_release_entry entries[num];
+	struct rte_mbuf *mbufs[num];
 	int i, ret;
 	unsigned int core_id;
 	struct pp2_hif *hif;
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:32.613163314 +0100
+++ 0112-net-mvpp2-fix-stack-corruption.patch	2021-02-04 12:04:28.142789836 +0100
@@ -1 +1 @@
-From 8ce3c5db531eaf339ed60fb0ef97eab05c77846b Mon Sep 17 00:00:00 2001
+From abaa646aa09bd6fffb87611da6d2fdf2dc6f7c5c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8ce3c5db531eaf339ed60fb0ef97eab05c77846b ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 1d67f2abf1..2f5b2f256b 100644
+index 9037274327..6c9c5ef2f2 100644
@@ -22 +23 @@
-@@ -1614,8 +1614,8 @@ mrvl_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
+@@ -1611,8 +1611,8 @@ mrvl_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)