DPDK patches and discussions
 help / color / mirror / Atom feed
From: Michal Krawczyk <mk@semihalf.com>
To: Marcin Wojtas <mw@semihalf.com>,
	Michal Krawczyk <mk@semihalf.com>,
	Guy Tzalik <gtzalik@amazon.com>,
	Evgeny Schemeilin <evgenys@amazon.com>
Cc: dev@dpdk.org, matua@amazon.com, Rafal Kozik <rk@semihalf.com>
Subject: [dpdk-dev] [PATCH v1 22/24] net/ena: check pointer before memset
Date: Wed,  9 May 2018 14:47:12 +0200	[thread overview]
Message-ID: <20180509124714.23305-13-mk@semihalf.com> (raw)
In-Reply-To: <20180509124714.23305-1-mk@semihalf.com>

From: Rafal Kozik <rk@semihalf.com>

Need to check if memory allocation succeed before using it.
Using memset on NULL pointer cause segfault.

Fixes: 9ba7981ec992 ("ena: add communication layer for DPDK")

Signed-off-by: Rafal Kozik <rk@semihalf.com>
Acked-by: Michal Krawczyk <mk@semihalf.com>
---
 drivers/net/ena/base/ena_plat_dpdk.h | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
index dd54515b2..9d4cc7246 100644
--- a/drivers/net/ena/base/ena_plat_dpdk.h
+++ b/drivers/net/ena/base/ena_plat_dpdk.h
@@ -210,10 +210,15 @@ extern uint32_t ena_alloc_cnt;
 				"ena_alloc_%d", ena_alloc_cnt++);	\
 		mz = rte_memzone_reserve(z_name, size, SOCKET_ID_ANY,	\
 				RTE_MEMZONE_IOVA_CONTIG);		\
-		memset(mz->addr, 0, size);				\
-		virt = mz->addr;					\
-		phys = mz->iova;					\
 		handle = mz;						\
+		if (mz == NULL) {					\
+			virt = NULL;					\
+			phys = 0;					\
+		} else {						\
+			memset(mz->addr, 0, size);			\
+			virt = mz->addr;				\
+			phys = mz->iova;				\
+		}							\
 	} while (0)
 #define ENA_MEM_FREE_COHERENT(dmadev, size, virt, phys, handle) 	\
 		({ ENA_TOUCH(size); ENA_TOUCH(phys);			\
@@ -231,9 +236,14 @@ extern uint32_t ena_alloc_cnt;
 		mz = rte_memzone_reserve(z_name, size, node,		\
 				RTE_MEMZONE_IOVA_CONTIG);		\
 		mem_handle = mz;					\
-		memset(mz->addr, 0, size);				\
-		virt = mz->addr;					\
-		phys = mz->iova;					\
+		if (mz == NULL) {					\
+			virt = NULL;					\
+			phys = 0;					\
+		} else {						\
+			memset(mz->addr, 0, size);			\
+			virt = mz->addr;				\
+			phys = mz->iova;				\
+		}							\
 	} while (0)

 #define ENA_MEM_ALLOC_NODE(dmadev, size, virt, node, dev_node) \
--
2.14.1

  parent reply	other threads:[~2018-05-09 12:47 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-09 12:47 [dpdk-dev] [PATCH v1 10/24] net/ena: add watchdog and keep alive AENQ handler Michal Krawczyk
2018-05-09 12:47 ` [dpdk-dev] [PATCH v1 11/24] net/ena: add checking for admin queue state Michal Krawczyk
2018-05-09 12:47 ` [dpdk-dev] [PATCH v1 12/24] net/ena: make watchdog configurable Michal Krawczyk
2018-05-09 12:47 ` [dpdk-dev] [PATCH v1 13/24] net/ena: add RX out of order completion Michal Krawczyk
2018-05-09 12:47 ` [dpdk-dev] [PATCH v1 14/24] net/ena: linearize Tx mbuf Michal Krawczyk
2018-05-09 12:47 ` [dpdk-dev] [PATCH v1 15/24] net/ena: add info about max number of Tx/Rx descriptors Michal Krawczyk
2018-05-09 12:47 ` [dpdk-dev] [PATCH v1 16/24] net/ena: unimplemented handler error Michal Krawczyk
2018-05-09 12:47 ` [dpdk-dev] [PATCH v1 17/24] net/ena: rework configuration of IO queue numbers Michal Krawczyk
2018-05-09 12:47 ` [dpdk-dev] [PATCH v1 18/24] net/ena: validate Tx req id Michal Krawczyk
2018-05-09 12:47 ` [dpdk-dev] [PATCH v1 19/24] net/ena: add (un)likely statements Michal Krawczyk
2018-05-09 12:47 ` [dpdk-dev] [PATCH v1 20/24] net/ena: adjust error checking and cleaning Michal Krawczyk
2018-05-09 12:47 ` [dpdk-dev] [PATCH v1 21/24] net/ena: update numa node Michal Krawczyk
2018-05-09 12:47 ` Michal Krawczyk [this message]
2018-05-09 12:47 ` [dpdk-dev] [PATCH v1 23/24] net/ena: change memory type Michal Krawczyk
2018-05-09 12:47 ` [dpdk-dev] [PATCH v1 24/24] net/ena: fix GENMASK_ULL macro Michal Krawczyk

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=20180509124714.23305-13-mk@semihalf.com \
    --to=mk@semihalf.com \
    --cc=dev@dpdk.org \
    --cc=evgenys@amazon.com \
    --cc=gtzalik@amazon.com \
    --cc=matua@amazon.com \
    --cc=mw@semihalf.com \
    --cc=rk@semihalf.com \
    /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).