[dpdk-stable] patch 'eal: improve musl compatibility of string functions' has been queued to LTS release 17.11.7

Yongseok Koh yskoh at mellanox.com
Tue Jul 23 02:59:28 CEST 2019


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 <anatoly.burakov at intel.com>
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 <anatoly.burakov at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 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 <stdio.h>
+#include <string.h>
 
 /**
  * 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 <string.h>
 #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 <bsd/string.h>
-- 
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 <anatoly.burakov at intel.com>
 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 <stdio.h>
@@ -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


More information about the stable mailing list