From: Anatoly Burakov <anatoly.burakov@intel.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net, anatoly.burakov@intel.com
Subject: [dpdk-dev] [PATCH v2 09/10] mem: fix negative return value
Date: Wed, 18 Apr 2018 11:37:42 +0100 [thread overview]
Message-ID: <822a2658f3dd71c6d4d71968dc1114528d8df5cc.1524047073.git.anatoly.burakov@intel.com> (raw)
In-Reply-To: <cover.1524047073.git.anatoly.burakov@intel.com>
In-Reply-To: <cover.1524047073.git.anatoly.burakov@intel.com>
Although unlikely during normal operation, rte_socket_id_by_idx()
may return a negative value, which would've caused an out-of-bounds
read. Fix it by making socket ID signed, and check for negative
return.
Coverity issue: 272577
Coverity issue: 272578
Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists")
Cc: anatoly.burakov@intel.com
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
lib/librte_eal/common/eal_common_memory.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_memory.c b/lib/librte_eal/common/eal_common_memory.c
index 24a9ed5..68fc70e 100644
--- a/lib/librte_eal/common/eal_common_memory.c
+++ b/lib/librte_eal/common/eal_common_memory.c
@@ -205,7 +205,8 @@ memseg_primary_init_32(void)
{
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
int active_sockets, hpi_idx, msl_idx = 0;
- unsigned int socket_id, i;
+ unsigned int i;
+ int socket_id;
struct rte_memseg_list *msl;
uint64_t extra_mem_per_socket, total_extra_mem, total_requested_mem;
uint64_t max_mem;
@@ -238,6 +239,11 @@ memseg_primary_init_32(void)
uint64_t mem;
socket_id = rte_socket_id_by_idx(i);
+ if (socket_id < 0) {
+ RTE_LOG(ERR, EAL, "Invalid socket index: %u\n",
+ i);
+ continue;
+ }
mem = internal_config.socket_mem[socket_id];
if (mem == 0)
@@ -281,6 +287,10 @@ memseg_primary_init_32(void)
bool skip;
socket_id = rte_socket_id_by_idx(i);
+ if (socket_id < 0) {
+ RTE_LOG(ERR, EAL, "Invalid socket index: %u\n", i);
+ continue;
+ }
#ifndef RTE_EAL_NUMA_AWARE_HUGEPAGES
if (socket_id > 0)
@@ -294,10 +304,11 @@ memseg_primary_init_32(void)
* socket, and this is not master lcore
*/
master_lcore_socket = rte_lcore_to_socket_id(cfg->master_lcore);
- skip |= active_sockets == 0 && socket_id != master_lcore_socket;
+ skip |= active_sockets == 0 &&
+ (unsigned int)socket_id != master_lcore_socket;
if (skip) {
- RTE_LOG(DEBUG, EAL, "Will not preallocate memory on socket %u\n",
+ RTE_LOG(DEBUG, EAL, "Will not preallocate memory on socket %i\n",
socket_id);
continue;
}
--
2.7.4
next prev parent reply other threads:[~2018-04-18 10:37 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-17 15:50 [dpdk-dev] [PATCH 00/10] Coverity fixes for EAL memory Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 01/10] mem: use strlcpy instead of snprintf Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 02/10] mem: fix resource leak Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 03/10] mem: fix potential double close Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 04/10] mem: fix potential resource leak Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 05/10] " Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 06/10] mem: fix comparing pointer to value Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 07/10] mem: fix potential bad unmap Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 08/10] mem: fix statement having no effect Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 09/10] mem: fix negative return value Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 10/10] mem: fix possible use-after-free Anatoly Burakov
2018-04-17 15:56 ` [dpdk-dev] [PATCH 00/10] Coverity fixes for EAL memory Thomas Monjalon
2018-04-17 16:09 ` Burakov, Anatoly
2018-04-17 18:59 ` Thomas Monjalon
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 " Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 01/10] mem: use strlcpy instead of snprintf Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 02/10] mem: fix resource leak Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 03/10] mem: fix potential double close Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 04/10] mem: fix potential resource leak Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 05/10] " Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 06/10] mem: fix comparing pointer to value Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 07/10] mem: fix potential bad unmap Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 08/10] mem: fix statement having no effect Anatoly Burakov
2018-04-18 10:37 ` Anatoly Burakov [this message]
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 10/10] mem: fix possible use-after-free Anatoly Burakov
2018-04-25 9:56 ` [dpdk-dev] [PATCH v3 0/9] Coverity fixes for EAL memory Anatoly Burakov
2018-04-27 17:07 ` [dpdk-dev] [PATCH v4 " Anatoly Burakov
2018-04-27 21:25 ` Thomas Monjalon
2018-04-27 17:07 ` [dpdk-dev] [PATCH v4 1/9] mem: use strlcpy instead of snprintf Anatoly Burakov
2018-04-27 17:07 ` [dpdk-dev] [PATCH v4 2/9] mem: fix resource leak Anatoly Burakov
2018-04-27 17:07 ` [dpdk-dev] [PATCH v4 3/9] mem: fix potential double close Anatoly Burakov
2018-04-30 9:00 ` Bruce Richardson
2018-04-27 17:07 ` [dpdk-dev] [PATCH v4 4/9] mem: fix potential resource leak Anatoly Burakov
2018-04-27 17:07 ` [dpdk-dev] [PATCH v4 5/9] " Anatoly Burakov
2018-04-27 17:07 ` [dpdk-dev] [PATCH v4 6/9] mem: fix comparing pointer to value Anatoly Burakov
2018-04-27 17:07 ` [dpdk-dev] [PATCH v4 7/9] mem: fix potential bad unmap Anatoly Burakov
2018-04-27 17:07 ` [dpdk-dev] [PATCH v4 8/9] mem: fix statement having no effect Anatoly Burakov
2018-04-27 17:07 ` [dpdk-dev] [PATCH v4 9/9] mem: fix possible use-after-free Anatoly Burakov
2018-04-25 9:56 ` [dpdk-dev] [PATCH v3 1/9] mem: use strlcpy instead of snprintf Anatoly Burakov
2018-04-27 15:08 ` Bruce Richardson
2018-04-25 9:56 ` [dpdk-dev] [PATCH v3 2/9] mem: fix resource leak Anatoly Burakov
2018-04-27 15:13 ` Bruce Richardson
2018-04-25 9:56 ` [dpdk-dev] [PATCH v3 3/9] mem: fix potential double close Anatoly Burakov
2018-04-27 15:15 ` Bruce Richardson
2018-04-27 16:56 ` Burakov, Anatoly
2018-04-25 9:56 ` [dpdk-dev] [PATCH v3 4/9] mem: fix potential resource leak Anatoly Burakov
2018-04-27 15:18 ` Bruce Richardson
2018-04-27 15:28 ` Burakov, Anatoly
2018-04-27 15:39 ` Burakov, Anatoly
2018-04-27 15:48 ` Bruce Richardson
2018-04-25 9:56 ` [dpdk-dev] [PATCH v3 5/9] " Anatoly Burakov
2018-04-27 15:21 ` Bruce Richardson
2018-04-27 15:49 ` Burakov, Anatoly
2018-04-27 15:52 ` Bruce Richardson
2018-04-27 15:55 ` Burakov, Anatoly
2018-04-27 16:27 ` Bruce Richardson
2018-04-27 16:42 ` Burakov, Anatoly
2018-04-25 9:56 ` [dpdk-dev] [PATCH v3 6/9] mem: fix comparing pointer to value Anatoly Burakov
2018-04-27 15:22 ` Bruce Richardson
2018-04-25 9:56 ` [dpdk-dev] [PATCH v3 7/9] mem: fix potential bad unmap Anatoly Burakov
2018-04-27 15:37 ` Bruce Richardson
2018-04-25 9:56 ` [dpdk-dev] [PATCH v3 8/9] mem: fix statement having no effect Anatoly Burakov
2018-04-27 15:39 ` Bruce Richardson
2018-04-25 9:56 ` [dpdk-dev] [PATCH v3 9/9] mem: fix possible use-after-free Anatoly Burakov
2018-04-27 15:45 ` Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=822a2658f3dd71c6d4d71968dc1114528d8df5cc.1524047073.git.anatoly.burakov@intel.com \
--to=anatoly.burakov@intel.com \
--cc=dev@dpdk.org \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).