mem: allow full length name
authorZoltan Kiss <zoltan.kiss@schaman.hu>
Wed, 20 Jul 2016 17:16:39 +0000 (18:16 +0100)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Thu, 21 Jul 2016 21:05:01 +0000 (23:05 +0200)
(strlen(name) == sizeof(mz->name) - 1) is a valid case, change the
condition to reflect that.
Move it earlier to avoid lookup with invalid name.
Change errno to ENAMETOOLONG.

Fixes: 85cf0079 ("mem: avoid memzone/mempool/ring name truncation")

Signed-off-by: Zoltan Kiss <zoltan.kiss@schaman.hu>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
lib/librte_eal/common/eal_common_memzone.c

index 5d28341..1bd0a33 100644 (file)
@@ -144,16 +144,16 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
                return NULL;
        }
 
-       /* zone already exist */
-       if ((memzone_lookup_thread_unsafe(name)) != NULL) {
-               RTE_LOG(DEBUG, EAL, "%s(): memzone <%s> already exists\n",
+       if (strlen(name) > sizeof(mz->name) - 1) {
+               RTE_LOG(DEBUG, EAL, "%s(): memzone <%s>: name too long\n",
                        __func__, name);
-               rte_errno = EEXIST;
+               rte_errno = ENAMETOOLONG;
                return NULL;
        }
 
-       if (strlen(name) >= sizeof(mz->name) - 1) {
-               RTE_LOG(DEBUG, EAL, "%s(): memzone <%s>: name too long\n",
+       /* zone already exist */
+       if ((memzone_lookup_thread_unsafe(name)) != NULL) {
+               RTE_LOG(DEBUG, EAL, "%s(): memzone <%s> already exists\n",
                        __func__, name);
                rte_errno = EEXIST;
                return NULL;