[dpdk-stable] patch 'net/i40e: fix wild pointer' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

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/24/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 f956486556f0181bb3eb819f6afad42e08b9dcd7 Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1 at intel.com>
Date: Mon, 18 May 2020 16:00:51 +0800
Subject: [PATCH] net/i40e: fix wild pointer

[ upstream commit b342fd9084cf99292f0077e16b0edb3b6b79f6e7 ]

In i40e PMD code of function i40e_res_pool_free(), if valid_entry
is freed by "rte_free(valid_entry);" in the code, then the following
code for pool update may still use the wild pointer "valid_entry"
for pool info update. It seems has the risk of core dump for
using wild pointer operation, we should avoid this risk.

Fixes: 4861cde46116 ("i40e: new poll mode driver")

Signed-off-by: Wei Zhao <wei.zhao1 at intel.com>
Reviewed-by: Jeff Guo <jia.guo at intel.com>
Reviewed-by: Xiaolong Ye <xiaolong.ye at intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 55ba606f85..430e347073 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -4927,6 +4927,7 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
 {
 	struct pool_entry *entry, *next, *prev, *valid_entry = NULL;
 	uint32_t pool_offset;
+	uint16_t len;
 	int insert;
 
 	if (pool == NULL) {
@@ -4965,12 +4966,13 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
 	}
 
 	insert = 0;
+	len = valid_entry->len;
 	/* Try to merge with next one*/
 	if (next != NULL) {
 		/* Merge with next one */
-		if (valid_entry->base + valid_entry->len == next->base) {
+		if (valid_entry->base + len == next->base) {
 			next->base = valid_entry->base;
-			next->len += valid_entry->len;
+			next->len += len;
 			rte_free(valid_entry);
 			valid_entry = next;
 			insert = 1;
@@ -4980,13 +4982,15 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
 	if (prev != NULL) {
 		/* Merge with previous one */
 		if (prev->base + prev->len == valid_entry->base) {
-			prev->len += valid_entry->len;
+			prev->len += len;
 			/* If it merge with next one, remove next node */
 			if (insert == 1) {
 				LIST_REMOVE(valid_entry, next);
 				rte_free(valid_entry);
+				valid_entry = NULL;
 			} else {
 				rte_free(valid_entry);
+				valid_entry = NULL;
 				insert = 1;
 			}
 		}
@@ -5002,8 +5006,8 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
 			LIST_INSERT_HEAD(&pool->free_list, valid_entry, next);
 	}
 
-	pool->num_free += valid_entry->len;
-	pool->num_alloc -= valid_entry->len;
+	pool->num_free += len;
+	pool->num_alloc -= len;
 
 	return 0;
 }
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-22 10:37:40.776407803 +0100
+++ 0040-net-i40e-fix-wild-pointer.patch	2020-05-22 10:37:39.256415008 +0100
@@ -1,8 +1,10 @@
-From b342fd9084cf99292f0077e16b0edb3b6b79f6e7 Mon Sep 17 00:00:00 2001
+From f956486556f0181bb3eb819f6afad42e08b9dcd7 Mon Sep 17 00:00:00 2001
 From: Wei Zhao <wei.zhao1 at intel.com>
 Date: Mon, 18 May 2020 16:00:51 +0800
 Subject: [PATCH] net/i40e: fix wild pointer
 
+[ upstream commit b342fd9084cf99292f0077e16b0edb3b6b79f6e7 ]
+
 In i40e PMD code of function i40e_res_pool_free(), if valid_entry
 is freed by "rte_free(valid_entry);" in the code, then the following
 code for pool update may still use the wild pointer "valid_entry"
@@ -10,7 +12,6 @@
 using wild pointer operation, we should avoid this risk.
 
 Fixes: 4861cde46116 ("i40e: new poll mode driver")
-Cc: stable at dpdk.org
 
 Signed-off-by: Wei Zhao <wei.zhao1 at intel.com>
 Reviewed-by: Jeff Guo <jia.guo at intel.com>
@@ -20,10 +21,10 @@
  1 file changed, 9 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
-index 91dcd0ebf0..c68fba125e 100644
+index 55ba606f85..430e347073 100644
 --- a/drivers/net/i40e/i40e_ethdev.c
 +++ b/drivers/net/i40e/i40e_ethdev.c
-@@ -4935,6 +4935,7 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
+@@ -4927,6 +4927,7 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
  {
  	struct pool_entry *entry, *next, *prev, *valid_entry = NULL;
  	uint32_t pool_offset;
@@ -31,7 +32,7 @@
  	int insert;
  
  	if (pool == NULL) {
-@@ -4973,12 +4974,13 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
+@@ -4965,12 +4966,13 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
  	}
  
  	insert = 0;
@@ -47,7 +48,7 @@
  			rte_free(valid_entry);
  			valid_entry = next;
  			insert = 1;
-@@ -4988,13 +4990,15 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
+@@ -4980,13 +4982,15 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
  	if (prev != NULL) {
  		/* Merge with previous one */
  		if (prev->base + prev->len == valid_entry->base) {
@@ -64,7 +65,7 @@
  				insert = 1;
  			}
  		}
-@@ -5010,8 +5014,8 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
+@@ -5002,8 +5006,8 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
  			LIST_INSERT_HEAD(&pool->free_list, valid_entry, next);
  	}