From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 7E72CA05D3 for ; Thu, 25 Apr 2019 17:42:13 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7036E1B5FF; Thu, 25 Apr 2019 17:42:13 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id B32261B5FF for ; Thu, 25 Apr 2019 17:42:11 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0C4318AE4C; Thu, 25 Apr 2019 15:42:11 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.116.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id F23815DE87; Thu, 25 Apr 2019 15:42:09 +0000 (UTC) From: Kevin Traynor To: Chaitanya Babu Talluri Cc: Ferruh Yigit , dpdk stable Date: Thu, 25 Apr 2019 16:40:32 +0100 Message-Id: <20190425154037.28778-57-ktraynor@redhat.com> In-Reply-To: <20190425154037.28778-1-ktraynor@redhat.com> References: <20190425154037.28778-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 25 Apr 2019 15:42:11 +0000 (UTC) Subject: [dpdk-stable] patch 'cfgfile: replace strcat with strlcat' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Acked-by: Ferruh Yigit --- 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 #include +#include #include @@ -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@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 + #include ++#include + #include + +@@ -225,8 +226,9 @@ rte_cfgfile_load_with_params(const char *filename, int flags,