From patchwork Wed May 9 12:47:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Krawczyk X-Patchwork-Id: 39595 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3E0391B68E; Wed, 9 May 2018 14:47:54 +0200 (CEST) Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by dpdk.org (Postfix) with ESMTP id 236671B64A for ; Wed, 9 May 2018 14:47:39 +0200 (CEST) Received: by mail-lf0-f65.google.com with SMTP id t129-v6so11470566lff.3 for ; Wed, 09 May 2018 05:47:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ykyHpQ0iVAwVZ+KiE//o9Gk1ovH04Kndfr4o4Z69GpY=; b=i1fcpu7Ovusu38dIuQ1hvW4UTtikz2GbrBITaZYJvsDHTXpJPXx/uftxuXH3LcgS8p YBfSbc3seNCo6taYkPL2qk44T3RfCIITKqOuz8++wua09PqR5X7/eMgr4jo3Mdfk2tNb sYSluK8x25fcZtmPJhsDk5xL2jr6/YQBAI0haQgexYyDV8E1LsJf6PhgWaKRM/TJ2n1n RyEb4tgIKD0486Jq7oDspjft0lA5arVaJK9poFxpLOyb0huql/A49R9K4bDJhLHWbSr4 J+TLi20NHkgXwuqIi0m3W9YF79MDzKWewMzvHATSqvDsqKmCWajBPY9HBbYQ2S7VYzSA k4VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ykyHpQ0iVAwVZ+KiE//o9Gk1ovH04Kndfr4o4Z69GpY=; b=F7EPibCfgCzbYgBByP++9/w20sjYBLp6UhjVZh6+IRQjO4Yx9eg1Uh8S98eQzer8MS rXqpy1983DRA2Hjb71EnliAMa/y93d+fOQK41b2BSLPpPzMeWPBLz7tHTsMDsNBu+kr6 HnR4TjK9zGXlT0BVnuQzcoKZa87oBFz8iUMOpQLrpVwwK2vqc1cWMk47s5yFqqKhB+CY EYLHcKYGvWekySUIcaQHyJ0i8p/wE9tDhiF0nR/s8vXYxOePyBpJH4UE+6mHdIkK43+9 BytzWU/A3b/+TcMIzIaoGRGThLTfIVVy1aIQ8nTxN1xg3ohzNW+M0FEEmOU7vfiUQuxY QICQ== X-Gm-Message-State: ALKqPwdHhbDTgp3aDJOhDwyGeAis7Cz4CPdGhtst+uxZXCiUlP9JmrXt 4jrhx2VeU4PV03kWp3kgWuJfsbdmSjg= X-Google-Smtp-Source: AB8JxZp16FB5fIXljGjohLD9/jt7IHmQtNcokGRDzOxW6QcSaWtBO/4gux2Ns0Qx3gnXOaz+kUKqZg== X-Received: by 2002:a19:f518:: with SMTP id j24-v6mr1393661lfb.116.1525870058789; Wed, 09 May 2018 05:47:38 -0700 (PDT) Received: from mkPC.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id l10-v6sm5149258lja.62.2018.05.09.05.47.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 May 2018 05:47:37 -0700 (PDT) From: Michal Krawczyk To: Marcin Wojtas , Michal Krawczyk , Guy Tzalik , Evgeny Schemeilin Cc: dev@dpdk.org, matua@amazon.com, Rafal Kozik Date: Wed, 9 May 2018 14:47:12 +0200 Message-Id: <20180509124714.23305-13-mk@semihalf.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180509124714.23305-1-mk@semihalf.com> References: <20180509124714.23305-1-mk@semihalf.com> Subject: [dpdk-dev] [PATCH v1 22/24] net/ena: check pointer before memset X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Rafal Kozik 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 Acked-by: Michal Krawczyk --- drivers/net/ena/base/ena_plat_dpdk.h | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) -- 2.14.1 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) \