From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B5ABAA046B for ; Tue, 23 Jul 2019 03:03:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AC00C1BFA1; Tue, 23 Jul 2019 03:03:30 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 9CEF01BFAC for ; Tue, 23 Jul 2019 03:03:29 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:03:26 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6N11Hfw026580; Tue, 23 Jul 2019 04:03:24 +0300 From: Yongseok Koh To: Chaitanya Babu Talluri Cc: Ferruh Yigit , dpdk stable Date: Mon, 22 Jul 2019 18:00:39 -0700 Message-Id: <20190723010115.6446-72-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'cfgfile: replace strcat with strlcat' has been queued to LTS release 17.11.7 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 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 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 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 eacf93a8c3..0453a77665 100644 --- a/lib/librte_cfgfile/rte_cfgfile.c +++ b/lib/librte_cfgfile/rte_cfgfile.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #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 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@dpdk.org Signed-off-by: Chaitanya Babu Talluri Acked-by: Ferruh Yigit --- - 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 + #include + #include ++#include + #include + + #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]));