eal: remove size for setting runtime directory

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 <stephen@networkplumber.org>
Reviewed-by: Morten Brørup <mb@smartsharesystems.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>

diff --git a/lib/eal/common/eal_common_config.c b/lib/eal/common/eal_common_config.c
index 6d19aadb20574d75eb9ba5314cf44d95d01f4229..3cef43a4f706711a1ca62a2b1ed4755cd137b11a 100644 (file)
--- 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 36bcc0b5a49227580c40c6a1d0bb16ca468cef05..734f1f334b696906731f86645cbcf8eb27178ef8 100644 (file)
--- 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 a1cd2462db1b1e190514aa04d9364b0eea82d301..503e276dc27fa7f6024fef9c4117fa84d03e0bd8 100644 (file)
--- 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 9c8395ab14d0be917ddc84915dddf707c03a4148..e37372ac73052c0ab04145386b5060ac8265f0cd 100644 (file)
--- 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;