[dpdk-stable] patch 'net/ice: add memory allocation check in RSS init' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/08/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 4180d0e9e07078f0d9f3c03e128ee4fda1e2658e Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
Date: Tue, 28 Jul 2020 21:11:27 +0800
Subject: [PATCH] net/ice: add memory allocation check in RSS init

[ upstream commit e40a84ebedf3d8f6ea00f6c10d0fc885a8163d43 ]

The function rte_zmalloc() could return NULL, the return
value need to be checked.

Fixes: 50370662b727 ("net/ice: support device and queue ops")

Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_ethdev.c | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 34ca161e5..cb71d7bfd 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2464,13 +2464,24 @@ static int ice_init_rss(struct ice_pf *pf)
 		return 0;
 	}
 
-	if (!vsi->rss_key)
+	if (!vsi->rss_key) {
 		vsi->rss_key = rte_zmalloc(NULL,
 					   vsi->rss_key_size, 0);
-	if (!vsi->rss_lut)
+		if (vsi->rss_key == NULL) {
+			PMD_DRV_LOG(ERR, "Failed to allocate memory for rss_key");
+			return -ENOMEM;
+		}
+	}
+	if (!vsi->rss_lut) {
 		vsi->rss_lut = rte_zmalloc(NULL,
 					   vsi->rss_lut_size, 0);
-
+		if (vsi->rss_lut == NULL) {
+			PMD_DRV_LOG(ERR, "Failed to allocate memory for rss_key");
+			rte_free(vsi->rss_key);
+			vsi->rss_key = NULL;
+			return -ENOMEM;
+		}
+	}
 	/* configure RSS key */
 	if (!rss_conf->rss_key) {
 		/* Calculate the default hash key */
@@ -2484,7 +2495,7 @@ static int ice_init_rss(struct ice_pf *pf)
 	rte_memcpy(key.standard_rss_key, vsi->rss_key, vsi->rss_key_size);
 	ret = ice_aq_set_rss_key(hw, vsi->idx, &key);
 	if (ret)
-		return -EINVAL;
+		goto out;
 
 	/* init RSS LUT table */
 	for (i = 0; i < vsi->rss_lut_size; i++)
@@ -2494,7 +2505,7 @@ static int ice_init_rss(struct ice_pf *pf)
 				 ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_PF,
 				 vsi->rss_lut, vsi->rss_lut_size);
 	if (ret)
-		return -EINVAL;
+		goto out;
 
 	/* Enable registers for symmetric_toeplitz function. */
 	reg = ICE_READ_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id));
@@ -2570,6 +2581,12 @@ static int ice_init_rss(struct ice_pf *pf)
 				__func__, ret);
 
 	return 0;
+out:
+	rte_free(vsi->rss_key);
+	vsi->rss_key = NULL;
+	rte_free(vsi->rss_lut);
+	vsi->rss_lut = NULL;
+	return -EINVAL;
 }
 
 static int
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:17.033766142 +0100
+++ 0032-net-ice-add-memory-allocation-check-in-RSS-init.patch	2020-08-06 10:53:15.824597876 +0100
@@ -1,13 +1,14 @@
-From e40a84ebedf3d8f6ea00f6c10d0fc885a8163d43 Mon Sep 17 00:00:00 2001
+From 4180d0e9e07078f0d9f3c03e128ee4fda1e2658e Mon Sep 17 00:00:00 2001
 From: Yunjian Wang <wangyunjian at huawei.com>
 Date: Tue, 28 Jul 2020 21:11:27 +0800
 Subject: [PATCH] net/ice: add memory allocation check in RSS init
 
+[ upstream commit e40a84ebedf3d8f6ea00f6c10d0fc885a8163d43 ]
+
 The function rte_zmalloc() could return NULL, the return
 value need to be checked.
 
 Fixes: 50370662b727 ("net/ice: support device and queue ops")
-Cc: stable at dpdk.org
 
 Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -16,10 +17,10 @@
  1 file changed, 22 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
-index a29c9addc..84a0d8e0b 100644
+index 34ca161e5..cb71d7bfd 100644
 --- a/drivers/net/ice/ice_ethdev.c
 +++ b/drivers/net/ice/ice_ethdev.c
-@@ -2707,13 +2707,24 @@ static int ice_init_rss(struct ice_pf *pf)
+@@ -2464,13 +2464,24 @@ static int ice_init_rss(struct ice_pf *pf)
  		return 0;
  	}
  
@@ -47,7 +48,7 @@
  	/* configure RSS key */
  	if (!rss_conf->rss_key) {
  		/* Calculate the default hash key */
-@@ -2727,7 +2738,7 @@ static int ice_init_rss(struct ice_pf *pf)
+@@ -2484,7 +2495,7 @@ static int ice_init_rss(struct ice_pf *pf)
  	rte_memcpy(key.standard_rss_key, vsi->rss_key, vsi->rss_key_size);
  	ret = ice_aq_set_rss_key(hw, vsi->idx, &key);
  	if (ret)
@@ -56,7 +57,7 @@
  
  	/* init RSS LUT table */
  	for (i = 0; i < vsi->rss_lut_size; i++)
-@@ -2737,7 +2748,7 @@ static int ice_init_rss(struct ice_pf *pf)
+@@ -2494,7 +2505,7 @@ static int ice_init_rss(struct ice_pf *pf)
  				 ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_PF,
  				 vsi->rss_lut, vsi->rss_lut_size);
  	if (ret)
@@ -65,8 +66,8 @@
  
  	/* Enable registers for symmetric_toeplitz function. */
  	reg = ICE_READ_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id));
-@@ -2749,6 +2760,12 @@ static int ice_init_rss(struct ice_pf *pf)
- 	ice_rss_hash_set(pf, rss_conf->rss_hf);
+@@ -2570,6 +2581,12 @@ static int ice_init_rss(struct ice_pf *pf)
+ 				__func__, ret);
  
  	return 0;
 +out: