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 B1C61A0352; Sat, 5 Feb 2022 18:11:12 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 08251410EA; Sat, 5 Feb 2022 18:11:08 +0100 (CET) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mails.dpdk.org (Postfix) with ESMTP id 0C55240143 for ; Sat, 5 Feb 2022 18:11:05 +0100 (CET) Received: by mail-pg1-f174.google.com with SMTP id h125so7797254pgc.3 for ; Sat, 05 Feb 2022 09:11:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=grLbI7IKDPRQPWx2yKnoE7T8l/tN5TfmvlksrA9iqUk=; b=iQQb2JId2HgW+4TYBbo4uV6dkVTkREDaDm8k31LIJM4SYsoF5xE8pbXS81kLOa+UeF c/wYa8F6J4DiDXuapVN0grUSC6oI+XHGUMRRsZ41gbO5Zw3ffIERZtmYVVbUPy5GeBeb DresRXWSFaTnh9puO8dTvgg8KbS6meqc0PiX6yW32sZryhBwVF8tctfPxdwmmF8aHyLI gwjvgQNsKS1EBwkVGmgAFIJx1ILWzWUJcocDF6LHJgOwb8fQrY8lvHBf+MZeIMGBSJ/Y J2v5L5lfaVb0GT68m9fllJ6DpYZZDD9rUPaEX+3muAjbbqlSxE9B9EVTGpuTcPgLK0RX 9r9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=grLbI7IKDPRQPWx2yKnoE7T8l/tN5TfmvlksrA9iqUk=; b=HHgborZZD/W/63PY67cEVnhNoqhBXE+kzLc/fhn7DEtBKsTcTfpC0ev+TKwOmeMsrr PgxgQGaomHm3DzaTC+ctJMWSImsScm5sA5yV+Hi1Oqb3vj4TruMqUBeqWJl0ob23UyE+ A+IbFB+F7GGBhVkvOl9CSAm1UfoW6j04NBlz/cN+9Pp7YhLqFlCEdlmIXsTbI5VSNnaK 3CmZ102yYob+VU+h9tknAwxFgWpTZZkwqOsgLBaMZ7rBQLzo/PnyTZLmG0k09sb4kbqn xDRgVS0Rhn/2GFgP3RAZfU/pY+3SnR5Md9o3iZzyFtqUaKGOTir6cYfTKTQvGPUosfaX dm9g== X-Gm-Message-State: AOAM531n+MGJ4ccE3VrdbIBtVFLi8k6tdIJJcnodBEl5zBZvuDpzNnM3 ygS8PPTtuy4EprRWDH+w/KeIvXinwzmevd6H X-Google-Smtp-Source: ABdhPJyA7PcEJuYWfXpQICObhqn36/e0I5EwYxxkLoq7ed7FLaSTyFgetLlmjm3EkFZ/aJxBP7z+SQ== X-Received: by 2002:a63:2ad4:: with SMTP id q203mr3551380pgq.136.1644081064893; Sat, 05 Feb 2022 09:11:04 -0800 (PST) Received: from hermes.local (204-195-112-199.wavecable.com. [204.195.112.199]) by smtp.gmail.com with ESMTPSA id b13sm6600906pfm.27.2022.02.05.09.11.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Feb 2022 09:11:04 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , =?UTF-8?q?Morten=20Br=C3=B8rup?= Subject: [PATCH v2 1/2] eal: remove size for eal_set_runtime_dir Date: Sat, 5 Feb 2022 09:11:00 -0800 Message-Id: <20220205171101.7673-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220205171101.7673-1-stephen@networkplumber.org> References: <20220203060025.881552-1-stephen@networkplumber.org> <20220205171101.7673-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 The size argument to eal_set_runtime_dir is useless and was being used incorrectly in strlcpy. It worked only because all callers passed PATH_MAX which is same as sizeof the destination runtime_dir. Note: this is an internal API so no user exposed change. Signed-off-by: Stephen Hemminger Reviewed-by: Morten Brørup --- lib/eal/common/eal_common_config.c | 7 ++----- lib/eal/common/eal_private.h | 4 +--- lib/eal/freebsd/eal.c | 2 +- lib/eal/linux/eal.c | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/eal/common/eal_common_config.c b/lib/eal/common/eal_common_config.c index 1c4c4dd585d0..62a9d7a198db 100644 --- a/lib/eal/common/eal_common_config.c +++ b/lib/eal/common/eal_common_config.c @@ -29,12 +29,9 @@ rte_eal_get_runtime_dir(void) } int -eal_set_runtime_dir(char *run_dir, size_t size) +eal_set_runtime_dir(const char *run_dir) { - size_t str_size; - - str_size = strlcpy(runtime_dir, run_dir, size); - if (str_size >= size) { + if (strlcpy(runtime_dir, run_dir, PATH_MAX) >= PATH_MAX) { RTE_LOG(ERR, EAL, "Runtime directory string too long\n"); return -1; } diff --git a/lib/eal/common/eal_private.h b/lib/eal/common/eal_private.h index 36bcc0b5a492..734f1f334b69 100644 --- a/lib/eal/common/eal_private.h +++ b/lib/eal/common/eal_private.h @@ -681,13 +681,11 @@ eal_mem_set_dump(void *virt, size_t size, bool dump); * * @param run_dir * The new runtime directory path of DPDK - * @param size - * The size of the new runtime directory path in bytes. * @return * 0 on success, (-1) on failure. */ int -eal_set_runtime_dir(char *run_dir, size_t size); +eal_set_runtime_dir(const char *run_dir); /** * Get the internal configuration structure. diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c index a1cd2462db1b..503e276dc27f 100644 --- a/lib/eal/freebsd/eal.c +++ b/lib/eal/freebsd/eal.c @@ -123,7 +123,7 @@ eal_create_runtime_dir(void) return -1; } - if (eal_set_runtime_dir(run_dir, sizeof(run_dir))) + if (eal_set_runtime_dir(run_dir)) return -1; return 0; diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c index 60b49248388e..f2551c64b10c 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -137,7 +137,7 @@ eal_create_runtime_dir(void) return -1; } - if (eal_set_runtime_dir(run_dir, sizeof(run_dir))) + if (eal_set_runtime_dir(run_dir)) return -1; return 0; -- 2.34.1