[dpdk-stable] patch 'app/testpmd: fix memory leak for TM object' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

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/13/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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From ee97d28d8f493007bd555d9056ea1a3ec59ddb94 Mon Sep 17 00:00:00 2001
From: Jasvinder Singh <jasvinder.singh at intel.com>
Date: Tue, 6 Nov 2018 10:23:06 +0000
Subject: [PATCH] app/testpmd: fix memory leak for TM object

[ upstream commit 8bf02b320e27ec27af12d345663f557b04a4c677 ]

Fixes memory leak for shared shaper object of the traffic manager.

Fixes: 5b590fbe09b6 ("app/testpmd: add traffic management forwarding mode")

Signed-off-by: Jasvinder Singh <jasvinder.singh at intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 app/test-pmd/tm.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/test-pmd/tm.c b/app/test-pmd/tm.c
index dd837cb8c..d3ba86505 100644
--- a/app/test-pmd/tm.c
+++ b/app/test-pmd/tm.c
@@ -616,6 +616,7 @@ softport_tm_tc_node_add(portid_t port_id, struct tm_hierarchy *h,
 						error->message,
 						shaper_profile_id);
 
+					free(tnp.shared_shaper_id);
 					return -1;
 				}
 				tnp.shaper_profile_id = shaper_profile_id;
@@ -631,6 +632,7 @@ softport_tm_tc_node_add(portid_t port_id, struct tm_hierarchy *h,
 						error->message,
 						h->tc_node_id[pos][k]);
 
+					free(tnp.shared_shaper_id);
 					return -1;
 				}
 				shaper_profile_id++;
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.704900726 -0800
+++ 0015-app-testpmd-fix-memory-leak-for-TM-object.patch	2019-01-11 02:29:10.797973000 -0800
@@ -1,24 +1,25 @@
-From 8bf02b320e27ec27af12d345663f557b04a4c677 Mon Sep 17 00:00:00 2001
+From ee97d28d8f493007bd555d9056ea1a3ec59ddb94 Mon Sep 17 00:00:00 2001
 From: Jasvinder Singh <jasvinder.singh at intel.com>
 Date: Tue, 6 Nov 2018 10:23:06 +0000
 Subject: [PATCH] app/testpmd: fix memory leak for TM object
 
+[ upstream commit 8bf02b320e27ec27af12d345663f557b04a4c677 ]
+
 Fixes memory leak for shared shaper object of the traffic manager.
 
 Fixes: 5b590fbe09b6 ("app/testpmd: add traffic management forwarding mode")
-Cc: stable at dpdk.org
 
 Signed-off-by: Jasvinder Singh <jasvinder.singh at intel.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
 ---
- app/test-pmd/softnicfwd.c | 2 ++
+ app/test-pmd/tm.c | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/app/test-pmd/softnicfwd.c b/app/test-pmd/softnicfwd.c
-index 7ff622806..94e6669d3 100644
---- a/app/test-pmd/softnicfwd.c
-+++ b/app/test-pmd/softnicfwd.c
-@@ -458,6 +458,7 @@ softport_tm_tc_node_add(portid_t port_id,
+diff --git a/app/test-pmd/tm.c b/app/test-pmd/tm.c
+index dd837cb8c..d3ba86505 100644
+--- a/app/test-pmd/tm.c
++++ b/app/test-pmd/tm.c
+@@ -616,6 +616,7 @@ softport_tm_tc_node_add(portid_t port_id, struct tm_hierarchy *h,
  						error->message,
  						shaper_profile_id);
  
@@ -26,7 +27,7 @@
  					return -1;
  				}
  				tnp.shaper_profile_id = shaper_profile_id;
-@@ -473,6 +474,7 @@ softport_tm_tc_node_add(portid_t port_id,
+@@ -631,6 +632,7 @@ softport_tm_tc_node_add(portid_t port_id, struct tm_hierarchy *h,
  						error->message,
  						h->tc_node_id[pos][k]);