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 AD989A046B for ; Tue, 23 Jul 2019 03:01:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8ECE11BEDA; Tue, 23 Jul 2019 03:01:21 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 54FDF1BEDA for ; Tue, 23 Jul 2019 03:01:20 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:01:19 +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 x6N11Hel026580; Tue, 23 Jul 2019 04:01:18 +0300 From: Yongseok Koh To: Anatoly Burakov Cc: Bruce Richardson , dpdk stable Date: Mon, 22 Jul 2019 17:59:28 -0700 Message-Id: <20190723010115.6446-1-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'eal: improve musl compatibility of string functions' 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 2211463ddf5a7616f85d6ec46cfe2e43b2088a7f Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Thu, 4 Oct 2018 11:20:38 +0100 Subject: [PATCH] eal: improve musl compatibility of string functions [ upstream commit 0601defe2efd1bd8a165e9b0c170b05842aa74fc ] Musl wraps various string functions such as strlcpy in order to harden them. However, the fortify wrappers are included without including the actual string functions being wrapped, which throws missing definition compile errors. Fix by including string.h in string functions header. Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- lib/librte_eal/common/include/rte_string_fns.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/librte_eal/common/include/rte_string_fns.h b/lib/librte_eal/common/include/rte_string_fns.h index 7d57bb8ee9..27a9ecb8ba 100644 --- a/lib/librte_eal/common/include/rte_string_fns.h +++ b/lib/librte_eal/common/include/rte_string_fns.h @@ -45,6 +45,7 @@ extern "C" { #endif #include +#include /** * Takes string "string" parameter and splits it at character "delim" @@ -89,12 +90,10 @@ rte_strlcpy(char *dst, const char *src, size_t size) /* pull in a strlcpy function */ #ifdef RTE_EXEC_ENV_BSDAPP -#include #ifndef __BSD_VISIBLE /* non-standard functions are hidden */ #define strlcpy(dst, src, size) rte_strlcpy(dst, src, size) #endif - #else /* non-BSD platforms */ #ifdef RTE_USE_LIBBSD #include -- 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:06.591365319 -0700 +++ 0001-eal-improve-musl-compatibility-of-string-functions.patch 2019-07-22 17:55:05.692469000 -0700 @@ -1,8 +1,10 @@ -From 0601defe2efd1bd8a165e9b0c170b05842aa74fc Mon Sep 17 00:00:00 2001 +From 2211463ddf5a7616f85d6ec46cfe2e43b2088a7f Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Thu, 4 Oct 2018 11:20:38 +0100 Subject: [PATCH] eal: improve musl compatibility of string functions +[ upstream commit 0601defe2efd1bd8a165e9b0c170b05842aa74fc ] + Musl wraps various string functions such as strlcpy in order to harden them. However, the fortify wrappers are included without including the actual string functions being wrapped, which @@ -16,10 +18,10 @@ 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/librte_eal/common/include/rte_string_fns.h b/lib/librte_eal/common/include/rte_string_fns.h -index ecd141b852..9a2a1ff900 100644 +index 7d57bb8ee9..27a9ecb8ba 100644 --- a/lib/librte_eal/common/include/rte_string_fns.h +++ b/lib/librte_eal/common/include/rte_string_fns.h -@@ -16,6 +16,7 @@ extern "C" { +@@ -45,6 +45,7 @@ extern "C" { #endif #include @@ -27,7 +29,7 @@ /** * Takes string "string" parameter and splits it at character "delim" -@@ -60,12 +61,10 @@ rte_strlcpy(char *dst, const char *src, size_t size) +@@ -89,12 +90,10 @@ rte_strlcpy(char *dst, const char *src, size_t size) /* pull in a strlcpy function */ #ifdef RTE_EXEC_ENV_BSDAPP