[dpdk-stable] patch 'sched: fix memory leak on init failure' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/11/19. 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.

Kevin Traynor

---
>From b6cd764c39521574e7914aa72fba774dc7c6ea32 Mon Sep 17 00:00:00 2001
From: Tonghao Zhang <xiangxia.m.yue at gmail.com>
Date: Wed, 28 Nov 2018 05:55:55 -0800
Subject: [PATCH] sched: fix memory leak on init failure

[ upstream commit 03b7fd7e545f453f1d7c13d11bf8a0b7cd59a943 ]

In some case, we may create sched port dynamically,
if err when creating so memory will leak.

Fixes: de3cfa2c9823 ("sched: initial import")

Signed-off-by: Tonghao Zhang <xiangxia.m.yue at gmail.com>
---
 lib/librte_sched/rte_sched.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c
index 587d5e602..89c3d1e7f 100644
--- a/lib/librte_sched/rte_sched.c
+++ b/lib/librte_sched/rte_sched.c
@@ -668,4 +668,5 @@ rte_sched_port_config(struct rte_sched_port_params *params)
 				params->red_params[i][j].max_th,
 				params->red_params[i][j].maxp_inv) != 0) {
+				rte_free(port);
 				return NULL;
 			}
@@ -727,4 +728,5 @@ rte_sched_port_config(struct rte_sched_port_params *params)
 	if (port->bmp == NULL) {
 		RTE_LOG(ERR, SCHED, "Bitmap init error\n");
+		rte_free(port);
 		return NULL;
 	}
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-04 13:23:09.197144153 +0000
+++ 0072-sched-fix-memory-leak-on-init-failure.patch	2019-01-04 13:23:07.000000000 +0000
@@ -1,13 +1,14 @@
-From 03b7fd7e545f453f1d7c13d11bf8a0b7cd59a943 Mon Sep 17 00:00:00 2001
+From b6cd764c39521574e7914aa72fba774dc7c6ea32 Mon Sep 17 00:00:00 2001
 From: Tonghao Zhang <xiangxia.m.yue at gmail.com>
 Date: Wed, 28 Nov 2018 05:55:55 -0800
 Subject: [PATCH] sched: fix memory leak on init failure
 
+[ upstream commit 03b7fd7e545f453f1d7c13d11bf8a0b7cd59a943 ]
+
 In some case, we may create sched port dynamically,
 if err when creating so memory will leak.
 
 Fixes: de3cfa2c9823 ("sched: initial import")
-Cc: stable at dpdk.org
 
 Signed-off-by: Tonghao Zhang <xiangxia.m.yue at gmail.com>
 ---
@@ -15,16 +16,16 @@
  1 file changed, 2 insertions(+)
 
 diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c
-index dd7739172..77aed9fb2 100644
+index 587d5e602..89c3d1e7f 100644
 --- a/lib/librte_sched/rte_sched.c
 +++ b/lib/librte_sched/rte_sched.c
-@@ -655,4 +655,5 @@ rte_sched_port_config(struct rte_sched_port_params *params)
+@@ -668,4 +668,5 @@ rte_sched_port_config(struct rte_sched_port_params *params)
  				params->red_params[i][j].max_th,
  				params->red_params[i][j].maxp_inv) != 0) {
 +				rte_free(port);
  				return NULL;
  			}
-@@ -714,4 +715,5 @@ rte_sched_port_config(struct rte_sched_port_params *params)
+@@ -727,4 +728,5 @@ rte_sched_port_config(struct rte_sched_port_params *params)
  	if (port->bmp == NULL) {
  		RTE_LOG(ERR, SCHED, "Bitmap init error\n");
 +		rte_free(port);