From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by dpdk.org (Postfix) with ESMTP id B24422B9D for ; Wed, 20 Jul 2016 19:17:17 +0200 (CEST) Received: by mail-wm0-f66.google.com with SMTP id x83so7890541wma.3 for ; Wed, 20 Jul 2016 10:17:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=schaman-hu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=oKXajLZW4uZ6P9SiO85bL5TmQj8v0NebwNNa3mO7lc4=; b=X2GRA6ptiHK+H31d0oeh+kCJKHXPTYxqDLuGHcYabbgSYbmhKoQ1bFBU+H9ismvIsp XBkASFGjVHyFTiqAQ/miLHVe555mWA+3McRGa1pHuxSSyR/Lkk0A86h7496/Amo14nmn A77s7i3zBNZDkUka/p0wcNNgMb5vk4jJoBbURBH174HO8RviRS1baXa0zG4sTbg6rlC1 eYGFyIkrSt+5vVvvFQnxp7lVYcPiTrrw2wiPrljadvRdsrMXsg6cbn2fZX+xIoiqIyAN uyQY2WetJEj8+YF1MQy+LIvGY3GOVhWObu9i3JfDe1fV7p5RponShm9QPqRxu7bkwhvN xUyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=oKXajLZW4uZ6P9SiO85bL5TmQj8v0NebwNNa3mO7lc4=; b=Y60Qhz7OogTvv/22jLdfQqzXYNYaWhuoZ52dYDT/0D3jvyZjkBpUxxFEZZHvsb9gYE N2RmX+sfbdCKo7PPaF8F2U/JItn1EldaZQ7Z6aXFaRe505QpOndMV9LUBKC8UBjBuQ6+ fomxN7TvD/qdH4Uf+jsdTDtmvBtuwNTb5cEDoW7Z+bP0muBQ8IUUgBdxFKbRKaIYKR0q TPcRyFrL54GPOuNfZdXlDSpoBi/ODnWmI29hD+oMlxRyWvH/sh97PQinnSCFwkqk7Vdc gy4xpGpsT6WLotv0lHzUsNiLyqbILJNXKh227ethiSfv6IBwuHbESawHzYv0NJAKgEUh h4Bw== X-Gm-Message-State: ALyK8tJY01d9rUN68kr4p7kmASKH2b5gBJgC1lzaXDGBVxKZWrS+EU0vhIZbhWfDXTMnZg== X-Received: by 10.195.3.36 with SMTP id bt4mr2643262wjd.146.1469035037383; Wed, 20 Jul 2016 10:17:17 -0700 (PDT) Received: from localhost.localdomain ([195.11.233.227]) by smtp.googlemail.com with ESMTPSA id dh3sm2220532wjb.28.2016.07.20.10.17.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Jul 2016 10:17:17 -0700 (PDT) From: Zoltan Kiss To: dev@dpdk.org Cc: olivier.matz@6wind.com Date: Wed, 20 Jul 2016 18:16:39 +0100 Message-Id: <1469034999-2732-2-git-send-email-zoltan.kiss@schaman.hu> X-Mailer: git-send-email 1.9.1 Subject: [dpdk-dev] [PATCH] memzone: allow full length name X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jul 2016 17:17:17 -0000 (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 --- lib/librte_eal/common/eal_common_memzone.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/librte_eal/common/eal_common_memzone.c b/lib/librte_eal/common/eal_common_memzone.c index 5d28341..1bd0a33 100644 --- a/lib/librte_eal/common/eal_common_memzone.c +++ b/lib/librte_eal/common/eal_common_memzone.c @@ -144,6 +144,13 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len, return NULL; } + if (strlen(name) > sizeof(mz->name) - 1) { + RTE_LOG(DEBUG, EAL, "%s(): memzone <%s>: name too long\n", + __func__, name); + rte_errno = ENAMETOOLONG; + return NULL; + } + /* zone already exist */ if ((memzone_lookup_thread_unsafe(name)) != NULL) { RTE_LOG(DEBUG, EAL, "%s(): memzone <%s> already exists\n", @@ -152,13 +159,6 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len, return NULL; } - if (strlen(name) >= sizeof(mz->name) - 1) { - RTE_LOG(DEBUG, EAL, "%s(): memzone <%s>: name too long\n", - __func__, name); - rte_errno = EEXIST; - return NULL; - } - /* if alignment is not a power of two */ if (align && !rte_is_power_of_2(align)) { RTE_LOG(ERR, EAL, "%s(): Invalid alignment: %u\n", __func__, -- 1.9.1