From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dariuszx.stojaczyk@intel.com>
Received: from mga07.intel.com (mga07.intel.com [134.134.136.100])
by dpdk.org (Postfix) with ESMTP id 2E0A9293C;
Mon, 4 Jun 2018 07:34:06 +0200 (CEST)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga002.fm.intel.com ([10.253.24.26])
by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
03 Jun 2018 22:34:05 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.49,475,1520924400"; d="scan'208";a="53437236"
Received: from kraken.imu.intel.com (HELO Sent) ([10.217.246.153])
by fmsmga002.fm.intel.com with SMTP; 03 Jun 2018 22:34:03 -0700
Received: by Sent (sSMTP sendmail emulation); Mon, 04 Jun 2018 07:33:53 +0200
From: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
To: dev@dpdk.org,
Anatoly Burakov <anatoly.burakov@intel.com>
Cc: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>,
stable@dpdk.org
Date: Mon, 4 Jun 2018 07:33:41 +0200
Message-Id: <1528090421-175748-1-git-send-email-dariuszx.stojaczyk@intel.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1527860679-110206-1-git-send-email-dariuszx.stojaczyk@intel.com>
References: <1527860679-110206-1-git-send-email-dariuszx.stojaczyk@intel.com>
Subject: [dpdk-dev] [PATCH v3] memory: fix segfault on rte_mem_virt2memseg()
call with invalid addr
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jun 2018 05:34:08 -0000
When trying to use it with an address that's not
managed by DPDK it would segfault due to a missing
check. The doc says this function returns either
a pointer or NULL, so let it do so.
Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists")
Cc: anatoly.burakov@intel.com
Cc: stable@dpdk.org
Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
Changes from v2:
* cleaned up commit msg
Changes from v1:
* removed gerrit change id
* added "git fixline" tags
lib/librte_eal/common/eal_common_memory.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/librte_eal/common/eal_common_memory.c b/lib/librte_eal/common/eal_common_memory.c
index 4f0688f..ecc5bb2 100644
--- a/lib/librte_eal/common/eal_common_memory.c
+++ b/lib/librte_eal/common/eal_common_memory.c
@@ -536,6 +536,9 @@ virt2memseg(const void *addr, const struct rte_memseg_list *msl)
void *start, *end;
int ms_idx;
+ if (msl == NULL)
+ return NULL;
+
/* a memseg list was specified, check if it's the right one */
start = msl->base_va;
end = RTE_PTR_ADD(start, (size_t)msl->page_sz * msl->memseg_arr.len);
--
2.7.4