[dpdk-stable] patch 'cfgfile: replace strcat with strlcat' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

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/01/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.

Queued patches can be viewed on the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
>From a031751261104144cba886bf259fcaef0dcc8bbf Mon Sep 17 00:00:00 2001
From: Chaitanya Babu Talluri <tallurix.chaitanya.babu at intel.com>
Date: Fri, 8 Mar 2019 12:45:50 +0000
Subject: [PATCH] cfgfile: replace strcat with strlcat

[ upstream commit bb411b952d6c70dc93de22aa3d092e385239de6c ]

Replace strcat with strlcat to avoid buffer overflow.

Fixes: a6a47ac9c2 ("cfgfile: rework load function")

Signed-off-by: Chaitanya Babu Talluri <tallurix.chaitanya.babu at intel.com>
Acked-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 lib/librte_cfgfile/rte_cfgfile.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/librte_cfgfile/rte_cfgfile.c b/lib/librte_cfgfile/rte_cfgfile.c
index 7d8c941ea..614269634 100644
--- a/lib/librte_cfgfile/rte_cfgfile.c
+++ b/lib/librte_cfgfile/rte_cfgfile.c
@@ -8,4 +8,5 @@
 #include <ctype.h>
 #include <errno.h>
+#include <rte_string_fns.h>
 #include <rte_common.h>
 
@@ -225,8 +226,9 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
 			char *end = memchr(split[1], '\\', strlen(split[1]));
 
+			size_t split_len = strlen(split[1]) + 1;
 			while (end != NULL) {
 				if (*(end+1) == params->comment_character) {
 					*end = '\0';
-					strcat(split[1], end+1);
+					strlcat(split[1], end+1, split_len);
 				} else
 					end++;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:49.200880637 +0100
+++ 0057-cfgfile-replace-strcat-with-strlcat.patch	2019-04-25 16:37:46.773294309 +0100
@@ -1 +1 @@
-From bb411b952d6c70dc93de22aa3d092e385239de6c Mon Sep 17 00:00:00 2001
+From a031751261104144cba886bf259fcaef0dcc8bbf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bb411b952d6c70dc93de22aa3d092e385239de6c ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -14,2 +15,2 @@
- lib/librte_cfgfile/rte_cfgfile.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ lib/librte_cfgfile/rte_cfgfile.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
@@ -18 +19 @@
-index 6110dba76..f8e7627a5 100644
+index 7d8c941ea..614269634 100644
@@ -21 +22,7 @@
-@@ -225,8 +225,9 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
+@@ -8,4 +8,5 @@
+ #include <ctype.h>
+ #include <errno.h>
++#include <rte_string_fns.h>
+ #include <rte_common.h>
+ 
+@@ -225,8 +226,9 @@ rte_cfgfile_load_with_params(const char *filename, int flags,