From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C38A44704A; Mon, 29 Dec 2025 21:49:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2D2304066A; Mon, 29 Dec 2025 21:48:49 +0100 (CET) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mails.dpdk.org (Postfix) with ESMTP id 9A7904066C for ; Mon, 29 Dec 2025 21:48:47 +0100 (CET) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-42fbc305914so6278012f8f.0 for ; Mon, 29 Dec 2025 12:48:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1767041327; x=1767646127; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xENSVfA4OY7osAGOXJzYwAuRbBDGQ00MSlq0aiG2ljo=; b=g3umC32+FXlOp5uvkuAVjr8ojOEtFF3vsn4Z6Q4KoPwHQJC0FU7Pg39KMwQYBrmmKA a63kIwhpN+wOV1UTbncXIlPPUuQRXqdqGHDOmkfhG0K8cj1Cad0z9RvVoO57Hd7RcW+7 2aORkV9FSWtdKBwI1Nl0NwN4VW06hn86HgvrzaBs8JWgwXemF+BqlSwc1k/3sWxzGaJM wYy2yrMobeL39PgS+s65gC0jzOFQTmhOoZ2O8XfwoDwF6NX5xMaP8ed5ReINy0aAX9sU a2x+U80tR2JWucuRGmp0a9euILpKf/intx53tUq36f0wMj8CKA1F+aQawD8nOu2Poe5L sSDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767041327; x=1767646127; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=xENSVfA4OY7osAGOXJzYwAuRbBDGQ00MSlq0aiG2ljo=; b=LJROnoyyzBJfGW42hsj0+JWyWXkAadxxhCpHnps4g0SDXEzh11+rMQIeFUvM4tqr7F OnG2PbjbMlnM0uFK3hlsG7EZMJ3GOpjcfnRsCPqPSKCDqGB+5ayP4Yigpxi9XG6xTiG1 GL32Mxk/g/EnRmpbNE5OEf3rhMs27Q0Y4368kZ2T/gj4wIGgux4Ng0yCisaXgvCui3mH YnYvxaIAmFkXCZbeBVyvspgRRxT1xKClO2n4rLRlHpLJ6fQSCbN7aEvA1xTNvLR9Zw/e 7ZwJdSxtATohKEqfluWE4Dq6RZk+xa4p1Ak3UXy3qcW+3xQFPlWQvUIlVJ12Hr0o147k GZUg== X-Gm-Message-State: AOJu0YwDHp6gpWLadLp6QsCELSmaSbdOAKgd9I73Q05dnVGgmVLuvxj2 3m3Ac+9171+uYULasyhO6QfkvmMV+PhB06W6F2+GjCJgze2S9Y5w1xUn6LR9u5+liYSZVndRNJn 3QKhtkVE= X-Gm-Gg: AY/fxX48SUO1TiR3dQ5c4Z9jtQDzx2ho7gQPOOhLh8kZrQM4Zhh3IWRv72fAUIxREzg akmz3q7XOcS60mW+xlpdo7gKePGBqgaU23JMyioJRrk+uNw7xspg7tl0BzNmro8MKrHP73qFJPs 6ifLkP51Splo83lf7ZQgvXgakyzXlfknN6RujfrXk58b1Z3MToqMvZO88g/qqF4uv8EHTUTodfV hUcypYTzllTc/j3Li8uRrKgUIfttiQREHCisnmzDYtylVNz0Lybzel6jH0pQR0+kSQM1A0yPvAz QVKgMynG2KOcnBPuDsEQc9Yy1JL1VXYs4CWMTh+IwmVEzTdKDSc6gsFbf6WKU78fdnyJquMhHQw XOZzXRvTCVKSKMJdlftnIOkGzgWYByh6+lOxSsoIQ1e4wdA1GN91W+y+Dk/DsHLaF1xUULhIoal 47a4CVzFHUQ4W465y33TWwX3HpIee49oZ1Jh1Va554aasvB5sv7Q== X-Google-Smtp-Source: AGHT+IH3ODRMQjsW16/H4w60aqAgVER7mgWA1OCQy7si66O0ILgzTQQvy9sk1k1Lhlcf/aLeuVLoBw== X-Received: by 2002:a05:6000:24c9:b0:430:fc0f:8fb3 with SMTP id ffacd0b85a97d-4324e506148mr41446532f8f.38.1767041327120; Mon, 29 Dec 2025 12:48:47 -0800 (PST) Received: from phoenix.lan (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4324eab2c4fsm64676298f8f.42.2025.12.29.12.48.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Dec 2025 12:48:46 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Bruce Richardson , Anatoly Burakov Subject: [PATCH v9 11/18] eal: limit maximum runtime directory and socket paths Date: Mon, 29 Dec 2025 11:38:09 -0800 Message-ID: <20251229204818.61231-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251229204818.61231-1-stephen@networkplumber.org> References: <20251202172626.283094-1-stephen@networkplumber.org> <20251229204818.61231-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Linux has a limitation of 108 characters (including null character) for AF_UNIX socket path. FreeBSD limit is smaller 104 characters and Windows has same definition (108) in afunix.h header. In current code, EAL will fail in telemetry, so this should not break existing users. EAL: Multi-process socket /var/run/dpdk/x7Q9mP2a... EAL: Selected IOVA mode 'VA' TELEMETRY: Error with socket binding, path too long Now long string fails on command line parsing: EAL: Runtime directory string too long EAL: Cannot create runtime directory EAL: Error parsing command line arguments. Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson --- lib/eal/common/eal_common_config.c | 6 ++- lib/eal/common/eal_common_proc.c | 85 +++++++++++++++++++----------- lib/eal/common/eal_filesystem.h | 17 +++++- 3 files changed, 74 insertions(+), 34 deletions(-) diff --git a/lib/eal/common/eal_common_config.c b/lib/eal/common/eal_common_config.c index 7fc7611a07..e2e69a75fb 100644 --- a/lib/eal/common/eal_common_config.c +++ b/lib/eal/common/eal_common_config.c @@ -6,6 +6,7 @@ #include #include "eal_private.h" +#include "eal_filesystem.h" #include "eal_memcfg.h" /* early configuration structure, when memory config is not mmapped */ @@ -24,7 +25,7 @@ static struct rte_config rte_config = { }; /* platform-specific runtime dir */ -static char runtime_dir[PATH_MAX]; +static char runtime_dir[UNIX_PATH_MAX]; /* internal configuration */ static struct internal_config internal_config; @@ -39,7 +40,8 @@ rte_eal_get_runtime_dir(void) int eal_set_runtime_dir(const char *run_dir) { - if (strlcpy(runtime_dir, run_dir, PATH_MAX) >= PATH_MAX) { + /* runtime directory limited by maximum allowable unix domain socket */ + if (strlcpy(runtime_dir, run_dir, UNIX_PATH_MAX) >= UNIX_PATH_MAX) { EAL_LOG(ERR, "Runtime directory string too long"); return -1; } diff --git a/lib/eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c index 62fd4ba88f..6744440420 100644 --- a/lib/eal/common/eal_common_proc.c +++ b/lib/eal/common/eal_common_proc.c @@ -36,10 +36,10 @@ static RTE_ATOMIC(int) mp_fd = -1; static rte_thread_t mp_handle_tid; -static char mp_filter[PATH_MAX]; /* Filter for secondary process sockets */ -static char mp_dir_path[PATH_MAX]; /* The directory path for all mp sockets */ +static char mp_filter[UNIX_PATH_MAX]; /* Filter for secondary process sockets */ +static char mp_dir_path[UNIX_PATH_MAX]; /* The directory path for all mp sockets */ static pthread_mutex_t mp_mutex_action = PTHREAD_MUTEX_INITIALIZER; -static char peer_name[PATH_MAX]; +static char peer_name[UNIX_PATH_MAX]; struct action_entry { TAILQ_ENTRY(action_entry) next; @@ -78,7 +78,7 @@ struct pending_request { REQUEST_TYPE_SYNC, REQUEST_TYPE_ASYNC } type; - char dst[PATH_MAX]; + char dst[UNIX_PATH_MAX]; struct rte_mp_msg *request; struct rte_mp_msg *reply; int reply_received; @@ -132,15 +132,19 @@ find_pending_request(const char *dst, const char *act_name) return r; } -static void -create_socket_path(const char *name, char *buf, int len) +/* + * Combine prefix and name(optional) to return unix domain socket path + * return the number of characters that would have been put into buffer. + */ +static int +create_socket_path(const char *name, char *buf, size_t len) { const char *prefix = eal_mp_socket_path(); if (strlen(name) > 0) - snprintf(buf, len, "%s_%s", prefix, name); + return snprintf(buf, len, "%s_%s", prefix, name); else - strlcpy(buf, prefix, len); + return strlcpy(buf, prefix, len); } RTE_EXPORT_SYMBOL(rte_eal_primary_proc_alive) @@ -565,24 +569,25 @@ async_reply_handle(void *arg) static int open_socket_fd(void) { - struct sockaddr_un un; + struct sockaddr_un un = { .sun_family = AF_UNIX }; peer_name[0] = '\0'; if (rte_eal_process_type() == RTE_PROC_SECONDARY) snprintf(peer_name, sizeof(peer_name), "%d_%"PRIx64, getpid(), rte_rdtsc()); + if (create_socket_path(peer_name, un.sun_path, sizeof(un.sun_path)) + >= (int)sizeof(un.sun_path)) { + EAL_LOG(ERR, "peer '%s' socket path too long", peer_name); + return -1; + } + mp_fd = socket(AF_UNIX, SOCK_DGRAM, 0); if (mp_fd < 0) { EAL_LOG(ERR, "failed to create unix socket"); return -1; } - memset(&un, 0, sizeof(un)); - un.sun_family = AF_UNIX; - - create_socket_path(peer_name, un.sun_path, sizeof(un.sun_path)); - unlink(un.sun_path); /* May still exist since last run */ if (bind(mp_fd, (struct sockaddr *)&un, sizeof(un)) < 0) { @@ -599,17 +604,20 @@ open_socket_fd(void) static void close_socket_fd(int fd) { - char path[PATH_MAX]; + char path[UNIX_PATH_MAX]; close(fd); - create_socket_path(peer_name, path, sizeof(path)); - unlink(path); + + if (create_socket_path(peer_name, path, sizeof(path)) < 0) + EAL_LOG(ERR, "file prefix path for peerr '%s' too long", peer_name); + else + unlink(path); } int rte_mp_channel_init(void) { - char path[PATH_MAX]; + char path[UNIX_PATH_MAX]; int dir_fd; const struct internal_config *internal_conf = eal_get_internal_configuration(); @@ -624,7 +632,12 @@ rte_mp_channel_init(void) } /* create filter path */ - create_socket_path("*", path, sizeof(path)); + if (create_socket_path("*", path, sizeof(path)) < 0) { + EAL_LOG(ERR, "file prefix path too long"); + rte_errno = ENAMETOOLONG; + return -1; + } + rte_basename(path, mp_filter, sizeof(mp_filter)); strlcpy(mp_dir_path, dirname(path), sizeof(mp_dir_path)); @@ -779,14 +792,17 @@ mp_send(struct rte_mp_msg *msg, const char *peer, int type) } while ((ent = readdir(mp_dir))) { - char path[PATH_MAX]; + char path[UNIX_PATH_MAX]; if (fnmatch(mp_filter, ent->d_name, 0) != 0) continue; - snprintf(path, sizeof(path), "%s/%s", mp_dir_path, - ent->d_name); - if (send_msg(path, msg, type) < 0) + if (snprintf(path, sizeof(path), "%s/%s", + mp_dir_path, ent->d_name) >= (int)sizeof(path)) { + EAL_LOG(ERR, "Unix domain path %s/%s too long", + mp_dir_path, ent->d_name); + ret = -1; + } else if (send_msg(path, msg, type) < 0) ret = -1; } /* unlock the dir */ @@ -1055,13 +1071,18 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply, pthread_mutex_lock(&pending_requests.lock); while ((ent = readdir(mp_dir))) { - char path[PATH_MAX]; + char path[UNIX_PATH_MAX]; if (fnmatch(mp_filter, ent->d_name, 0) != 0) continue; - snprintf(path, sizeof(path), "%s/%s", mp_dir_path, - ent->d_name); + if (snprintf(path, sizeof(path), "%s/%s", + mp_dir_path, ent->d_name) >= (int)sizeof(path)) { + EAL_LOG(ERR, "Unix domain socket path '%s/%s' too long", + mp_dir_path, ent->d_name); + rte_errno = ENAMETOOLONG; + goto unlock_end; + } /* unlocks the mutex while waiting for response, * locks on receive @@ -1200,15 +1221,17 @@ rte_mp_request_async(struct rte_mp_msg *req, const struct timespec *ts, } while ((ent = readdir(mp_dir))) { - char path[PATH_MAX]; + char path[UNIX_PATH_MAX]; if (fnmatch(mp_filter, ent->d_name, 0) != 0) continue; - snprintf(path, sizeof(path), "%s/%s", mp_dir_path, - ent->d_name); - - if (mp_request_async(path, copy, param, ts)) + if (snprintf(path, sizeof(path), "%s/%s", + mp_dir_path, ent->d_name) >= (int)sizeof(path)) { + EAL_LOG(ERR, "Unix domain path %s/%s too long", + mp_dir_path, ent->d_name); + ret = -1; + } else if (mp_request_async(path, copy, param, ts)) ret = -1; } /* if we didn't send anything, put dummy request on the queue */ diff --git a/lib/eal/common/eal_filesystem.h b/lib/eal/common/eal_filesystem.h index 5d21f07c20..70ae21b078 100644 --- a/lib/eal/common/eal_filesystem.h +++ b/lib/eal/common/eal_filesystem.h @@ -45,10 +45,25 @@ eal_runtime_config_path(void) /** Path of primary/secondary communication unix socket file. */ #define MP_SOCKET_FNAME "mp_socket" + +#ifdef RTE_EXEC_ENV_WINDOWS +/* + * UNIX_PATH_MAX is defined in afunux.h but that file is not in MingGW 9 + * which is the version in Ubuntu 22.04, in future this can change. + * Also, Unix domain sockets are not uses in DPDK on Windows (yet). + */ +#define UNIX_PATH_MAX 108 +#else +#include + +/** Maximum length of unix domain socket path. */ +#define UNIX_PATH_MAX (sizeof(((struct sockaddr_un *)0)->sun_path)) +#endif + static inline const char * eal_mp_socket_path(void) { - static char buffer[PATH_MAX]; /* static so auto-zeroed */ + static char buffer[UNIX_PATH_MAX]; /* static so auto-zeroed */ snprintf(buffer, sizeof(buffer), "%s/%s", rte_eal_get_runtime_dir(), MP_SOCKET_FNAME); -- 2.51.0