From: Dengdui Huang <huangdengdui@huawei.com>
To: <dev@dpdk.org>
Cc: <ferruh.yigit@amd.com>, <stephen@networkplumber.org>,
<lihuisong@huawei.com>, <fengchengwen@huawei.com>,
<liuyonglong@huawei.com>
Subject: [PATCH 08/43] telemetry: replace strerror
Date: Tue, 14 Nov 2023 16:25:04 +0800 [thread overview]
Message-ID: <20231114082539.1858594-9-huangdengdui@huawei.com> (raw)
In-Reply-To: <20231114082539.1858594-1-huangdengdui@huawei.com>
The function strerror() is insecure in a multi-thread environment.
This patch uses strerror_r() to replace it.
Cc: stable@dpdk.org
Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/telemetry/telemetry.c | 28 ++++++++++++++++++++++------
lib/telemetry/telemetry_legacy.c | 5 ++++-
2 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index 92982842a8..03be0d342a 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -411,6 +411,9 @@ client_handler(void *sock_id)
static void *
socket_listener(void *socket)
{
+#define ERR_BUFF_SZ 256
+ char err_buf[ERR_BUFF_SZ] = {0};
+
while (1) {
pthread_t th;
int rc;
@@ -433,8 +436,9 @@ socket_listener(void *socket)
rc = pthread_create(&th, NULL, s->fn,
(void *)(uintptr_t)s_accepted);
if (rc != 0) {
+ strerror_r(rc, err_buf, sizeof(err_buf));
TMTY_LOG(ERR, "Error with create client thread: %s\n",
- strerror(rc));
+ err_buf);
close(s_accepted);
if (s->num_clients != NULL)
rte_atomic_fetch_sub_explicit(s->num_clients, 1,
@@ -467,9 +471,13 @@ unlink_sockets(void)
static int
create_socket(char *path)
{
+#define ERR_BUFF_SZ 256
+ char err_buf[ERR_BUFF_SZ] = {0};
+
int sock = socket(AF_UNIX, SOCK_SEQPACKET, 0);
if (sock < 0) {
- TMTY_LOG(ERR, "Error with socket creation, %s\n", strerror(errno));
+ strerror_r(errno, err_buf, sizeof(err_buf));
+ TMTY_LOG(ERR, "Error with socket creation, %s\n", err_buf);
return -1;
}
@@ -499,14 +507,16 @@ create_socket(char *path)
TMTY_LOG(DEBUG, "Attempting unlink and retrying bind\n");
unlink(sun.sun_path);
if (bind(sock, (void *) &sun, sizeof(sun)) < 0) {
- TMTY_LOG(ERR, "Error binding socket: %s\n", strerror(errno));
+ strerror_r(errno, err_buf, sizeof(err_buf));
+ TMTY_LOG(ERR, "Error binding socket: %s\n", err_buf);
close(sock);
return -errno; /* if unlink failed, this will be -EADDRINUSE as above */
}
}
if (listen(sock, 1) < 0) {
- TMTY_LOG(ERR, "Error calling listen for socket: %s\n", strerror(errno));
+ strerror_r(errno, err_buf, sizeof(err_buf));
+ TMTY_LOG(ERR, "Error calling listen for socket: %s\n", err_buf);
unlink(sun.sun_path);
close(sock);
return -errno;
@@ -531,6 +541,8 @@ set_thread_name(pthread_t id __rte_unused, const char *name __rte_unused)
static int
telemetry_legacy_init(void)
{
+#define ERR_BUFF_SZ 256
+ char err_buf[ERR_BUFF_SZ] = {0};
pthread_t t_old;
int rc;
@@ -552,8 +564,9 @@ telemetry_legacy_init(void)
}
rc = pthread_create(&t_old, NULL, socket_listener, &v1_socket);
if (rc != 0) {
+ strerror_r(rc, err_buf, sizeof(err_buf));
TMTY_LOG(ERR, "Error with create legacy socket thread: %s\n",
- strerror(rc));
+ err_buf);
close(v1_socket.sock);
v1_socket.sock = -1;
unlink(v1_socket.path);
@@ -570,7 +583,9 @@ telemetry_legacy_init(void)
static int
telemetry_v2_init(void)
{
+#define ERR_BUFF_SZ 256
char spath[sizeof(v2_socket.path)];
+ char err_buf[ERR_BUFF_SZ] = {0};
pthread_t t_new;
short suffix = 0;
int rc;
@@ -606,8 +621,9 @@ telemetry_v2_init(void)
}
rc = pthread_create(&t_new, NULL, socket_listener, &v2_socket);
if (rc != 0) {
+ strerror_r(rc, err_buf, sizeof(err_buf));
TMTY_LOG(ERR, "Error with create socket thread: %s\n",
- strerror(rc));
+ err_buf);
close(v2_socket.sock);
v2_socket.sock = -1;
unlink(v2_socket.path);
diff --git a/lib/telemetry/telemetry_legacy.c b/lib/telemetry/telemetry_legacy.c
index 4c1d1c353a..3253dd9c1f 100644
--- a/lib/telemetry/telemetry_legacy.c
+++ b/lib/telemetry/telemetry_legacy.c
@@ -81,6 +81,8 @@ register_client(const char *cmd __rte_unused, const char *params,
char *buffer __rte_unused, int buf_len __rte_unused)
{
#ifndef RTE_EXEC_ENV_WINDOWS
+#define ERR_BUFF_SZ 256
+ char err_buf[ERR_BUFF_SZ] = {0};
pthread_t th;
char data[BUF_SIZE];
int fd;
@@ -117,8 +119,9 @@ register_client(const char *cmd __rte_unused, const char *params,
rc = pthread_create(&th, NULL, &legacy_client_handler,
(void *)(uintptr_t)fd);
if (rc != 0) {
+ strerror_r(rc, err_buf, sizeof(err_buf));
fprintf(stderr, "Failed to create legacy client thread: %s\n",
- strerror(rc));
+ err_buf);
close(fd);
return -1;
}
--
2.33.0
next prev parent reply other threads:[~2023-11-14 8:26 UTC|newest]
Thread overview: 139+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-14 8:24 [PATCH 00/43] " Dengdui Huang
2023-11-14 8:24 ` [PATCH 01/43] devtools: forbid use of strerror Dengdui Huang
2023-11-14 8:24 ` [PATCH 02/43] eal: use rte strerror Dengdui Huang
2023-11-15 0:18 ` Stephen Hemminger
2023-11-15 11:16 ` Morten Brørup
2024-02-01 21:49 ` Stephen Hemminger
2023-11-15 0:22 ` Stephen Hemminger
2023-11-15 11:23 ` Morten Brørup
2023-11-15 15:06 ` Stephen Hemminger
2023-11-14 8:24 ` [PATCH 03/43] eventdev: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 04/43] latency: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 05/43] node: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 06/43] pdump: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 07/43] power: " Dengdui Huang
2023-11-14 8:25 ` Dengdui Huang [this message]
2023-11-14 8:25 ` [PATCH 09/43] vhost: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 10/43] bpf: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 11/43] bus/cdx: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 12/43] bus/dpaa: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 13/43] bus/fslmc: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 14/43] bus/pci: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 15/43] bus/vdev: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 16/43] bus/vmbus: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 17/43] common/cnxk: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 18/43] common/mlx5: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 19/43] crypto/caam_jr: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 20/43] dma/idxd: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 21/43] net/af_packet: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 22/43] net/bnxt: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 23/43] net/af_xdp: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 24/43] net/bonding: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 25/43] net/dpaa: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 26/43] net/dpaa2: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 27/43] net/enetfec: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 28/43] net/failsafe: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 29/43] net/i40e: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 30/43] net/ice: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 31/43] net/ixgbe: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 32/43] net/memif: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 33/43] net/mlx4: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 34/43] net/mlx5: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 35/43] net/qede: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 36/43] net/sfc: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 37/43] net/tap: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 38/43] net/vhost: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 39/43] net/virtio: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 40/43] raw/ifpga: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 41/43] vdpa/ifc: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 42/43] vdpa/mlx5: " Dengdui Huang
2023-11-14 8:25 ` [PATCH 43/43] vdpa/sfc: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 00/43] replace strerror Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 01/43] devtools: forbid use of strerror Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 02/43] eal: use rte strerror Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 03/43] eventdev: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 04/43] latency: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 05/43] node: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 06/43] pdump: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 07/43] power: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 08/43] telemetry: replace strerror Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 09/43] vhost: use rte strerror Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 10/43] bpf: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 11/43] bus/cdx: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 12/43] bus/dpaa: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 13/43] bus/fslmc: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 14/43] bus/pci: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 15/43] bus/vdev: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 16/43] bus/vmbus: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 17/43] common/cnxk: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 18/43] common/mlx5: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 19/43] crypto/caam_jr: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 20/43] dma/idxd: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 21/43] net/af_packet: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 22/43] net/bnxt: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 23/43] net/af_xdp: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 24/43] net/bonding: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 25/43] net/dpaa: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 26/43] net/dpaa2: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 27/43] net/enetfec: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 28/43] net/failsafe: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 29/43] net/i40e: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 30/43] net/ice: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 31/43] net/ixgbe: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 32/43] net/memif: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 33/43] net/mlx4: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 34/43] net/mlx5: " Dengdui Huang
2023-11-14 11:23 ` [PATCH v2 35/43] net/qede: " Dengdui Huang
2023-11-14 11:24 ` [PATCH v2 36/43] net/sfc: " Dengdui Huang
2023-11-14 11:24 ` [PATCH v2 37/43] net/tap: " Dengdui Huang
2023-11-14 11:24 ` [PATCH v2 38/43] net/vhost: " Dengdui Huang
2023-11-14 11:24 ` [PATCH v2 39/43] net/virtio: " Dengdui Huang
2023-11-14 11:24 ` [PATCH v2 40/43] raw/ifpga: " Dengdui Huang
2023-11-14 11:24 ` [PATCH v2 41/43] vdpa/ifc: " Dengdui Huang
2023-11-14 11:24 ` [PATCH v2 42/43] vdpa/mlx5: " Dengdui Huang
2023-11-14 11:24 ` [PATCH v2 43/43] vdpa/sfc: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 00/42] replace strerror Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 01/42] devtools: forbid use of strerror Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 02/42] eal: use rte strerror Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 03/42] eventdev: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 04/42] latency: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 05/42] node: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 06/42] pdump: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 07/42] power: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 08/42] vhost: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 09/42] bpf: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 10/42] bus/cdx: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 11/42] bus/dpaa: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 12/42] bus/fslmc: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 13/42] bus/pci: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 14/42] bus/vdev: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 15/42] bus/vmbus: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 16/42] common/cnxk: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 17/42] common/mlx5: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 18/42] crypto/caam_jr: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 19/42] dma/idxd: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 20/42] net/af_packet: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 21/42] net/bnxt: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 22/42] net/af_xdp: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 23/42] net/bonding: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 24/42] net/dpaa: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 25/42] net/dpaa2: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 26/42] net/enetfec: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 27/42] net/failsafe: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 28/42] net/i40e: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 29/42] net/ice: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 30/42] net/ixgbe: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 31/42] net/memif: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 32/42] net/mlx4: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 33/42] net/mlx5: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 34/42] net/qede: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 35/42] net/sfc: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 36/42] net/tap: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 37/42] net/vhost: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 38/42] net/virtio: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 39/42] raw/ifpga: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 40/42] vdpa/ifc: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 41/42] vdpa/mlx5: " Dengdui Huang
2023-11-14 12:35 ` [PATCH v3 42/42] vdpa/sfc: " Dengdui Huang
2023-11-15 0:16 ` [PATCH 00/43] replace strerror Stephen Hemminger
2024-02-01 11:03 ` David Marchand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231114082539.1858594-9-huangdengdui@huawei.com \
--to=huangdengdui@huawei.com \
--cc=dev@dpdk.org \
--cc=fengchengwen@huawei.com \
--cc=ferruh.yigit@amd.com \
--cc=lihuisong@huawei.com \
--cc=liuyonglong@huawei.com \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).