[dpdk-stable] patch 'net/ice/base: fix memory allocation for MAC addresses' 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/f5b22356fcbeace247c0cac0ba5e074cc1a08d3a

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From f5b22356fcbeace247c0cac0ba5e074cc1a08d3a Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang at intel.com>
Date: Wed, 17 Mar 2021 14:02:19 +0800
Subject: [PATCH] net/ice/base: fix memory allocation for MAC addresses

[ upstream commit 78b52e3878c6496748cba2028f8cb9080435cb46 ]

Not enough memory be allocated for dev->data->mac_address which
cause out of bound memory access when iterate all mac addresses by
dev_info.max_mac_addrs.

Fixes: f9cf4f864150 ("net/ice: support device initialization")

Reported-by: Ferruh Yigit <ferruh.yigit at intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
Acked-by: Qiming Yang <qiming.yang at intel.com>
---
 drivers/net/ice/ice_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 2fc3b71544..00a6c7bcb3 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -795,7 +795,7 @@ ice_init_mac_address(struct rte_eth_dev *dev)
 		(struct rte_ether_addr *)hw->port_info[0].mac.perm_addr);
 
 	dev->data->mac_addrs =
-		rte_zmalloc(NULL, sizeof(struct rte_ether_addr), 0);
+		rte_zmalloc(NULL, sizeof(struct rte_ether_addr) * ICE_NUM_MACADDR_MAX, 0);
 	if (!dev->data->mac_addrs) {
 		PMD_INIT_LOG(ERR,
 			     "Failed to allocate memory to store mac address");
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-17 17:40:31.960001590 +0200
+++ 0062-net-ice-base-fix-memory-allocation-for-MAC-addresses.patch	2021-05-17 17:40:29.211809791 +0200
@@ -1 +1 @@
-From 78b52e3878c6496748cba2028f8cb9080435cb46 Mon Sep 17 00:00:00 2001
+From f5b22356fcbeace247c0cac0ba5e074cc1a08d3a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 78b52e3878c6496748cba2028f8cb9080435cb46 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 5a1190d50e..3e85e5f629 100644
+index 2fc3b71544..00a6c7bcb3 100644
@@ -24 +25 @@
-@@ -809,7 +809,7 @@ ice_init_mac_address(struct rte_eth_dev *dev)
+@@ -795,7 +795,7 @@ ice_init_mac_address(struct rte_eth_dev *dev)