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

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 07/27/19. So please
shout if anyone has objection.

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.

Yongseok

---
>From 80ed2ca13bbcd1d803bb2db8f4d5c3f20cbacc45 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

[ backported from 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 eacf93a8c3..0453a77665 100644
--- a/lib/librte_cfgfile/rte_cfgfile.c
+++ b/lib/librte_cfgfile/rte_cfgfile.c
@@ -36,6 +36,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
+#include <rte_string_fns.h>
 #include <rte_common.h>
 
 #include "rte_cfgfile.h"
@@ -253,10 +254,11 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
 			_strip(split[1], strlen(split[1]));
 			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++;
 				end = memchr(end, '\\', strlen(end));
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-07-22 17:55:10.351681493 -0700
+++ 0072-cfgfile-replace-strcat-with-strlcat.patch	2019-07-22 17:55:06.251472000 -0700
@@ -1,24 +1,33 @@
-From bb411b952d6c70dc93de22aa3d092e385239de6c Mon Sep 17 00:00:00 2001
+From 80ed2ca13bbcd1d803bb2db8f4d5c3f20cbacc45 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
 
+[ backported from upstream commit bb411b952d6c70dc93de22aa3d092e385239de6c ]
+
 Replace strcat with strlcat to avoid buffer overflow.
 
 Fixes: a6a47ac9c2 ("cfgfile: rework load function")
-Cc: stable at dpdk.org
 
 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 | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ 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 6110dba76b..f8e7627a51 100644
+index eacf93a8c3..0453a77665 100644
 --- a/lib/librte_cfgfile/rte_cfgfile.c
 +++ b/lib/librte_cfgfile/rte_cfgfile.c
-@@ -224,10 +224,11 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
+@@ -36,6 +36,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <errno.h>
++#include <rte_string_fns.h>
+ #include <rte_common.h>
+ 
+ #include "rte_cfgfile.h"
+@@ -253,10 +254,11 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
  			_strip(split[1], strlen(split[1]));
  			char *end = memchr(split[1], '\\', strlen(split[1]));