From patchwork Mon Jun 4 09:24:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Duszynski X-Patchwork-Id: 40600 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 7209347CD; Mon, 4 Jun 2018 11:24:42 +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 43E4E397D for ; Mon, 4 Jun 2018 11:24:41 +0200 (CEST) Received: by mail-lf0-f65.google.com with SMTP id 36-v6so22133400lfr.11 for ; Mon, 04 Jun 2018 02:24:41 -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; bh=Z8XNbd2X8vbO3JXgKQxwNQ2f9Uy4XHw5DcFGTIEc6FM=; b=QUwWx2jLSkZT1F11N73yLPrylIx7265Y5MKHlopl5banjXVIgC4NNWQA4WKvGLBDw+ H0Ut0Bj/p6fB7cLQnQDik0cXP/6zICbnAELqvuUYyAGmq2ngExz/iPquO0kU0By6TIbV 8kWQx4ThZMjpCM6I0BS6WnmZ4LcMYkRKshbWYI8iD0L13IE63SZpULOlF3FenfWrNj6q Tjwf7CYcWrzm0PL1ELcFoz69K0iszdyF1qJpjVMrEjLhEQnb+ReSgMQVE/k0jsB5ihaR 3s5YaZpQzW7Xxn4suT6bLCXiugUdchhpN1CCcsQ5J9M4vu1l2wfu3DfAFlA3YjlCcoP3 HTwQ== 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; bh=Z8XNbd2X8vbO3JXgKQxwNQ2f9Uy4XHw5DcFGTIEc6FM=; b=mwGfG1Kx4F+yPkm4A6RZ/MQzsvj7b6d8580i0DOOZ+wLquD+Nr5X8eH71RSF4xFySK EvN4BL56e/CgiLiutHc8OQIxAJsiA3WdTBDr0rDvuwfvhDCyhejiYy9AiOElfXL/yiIe TLdi9Iez+BlVTkf0OeRx2YYAIAqgOzXv1Cr+lqNS0eAok1LUqjULuND0Da3/IRN7lvWm l6knVwQsDo5Tg5jQd+rXcNExpcO4U5lcWvyO3wvvqEqywJ0YzW1K6UVbE6O6gB1ZIwnd cl6vlNk8+bfUGtRr/k1p9/do9ZJr0wJF9aIOykhcdcMrJYHXxh4lAAWOEG66gNLa4dlg NZyQ== X-Gm-Message-State: ALKqPwf0Yr7auS4n2UpqD77jNfl25UkCx8cgjcFAC9DzmrJUFGhE6an4 4sSdbPCyI2WsBrNfwMggFu4yAWj5iJM= X-Google-Smtp-Source: ADUXVKINW0MFedcwsG6CorRjbsTdVr3ZHJ9F64AwPXpv0EVXNgBNTjpEZ77fOobecTwIklV4muRfAg== X-Received: by 2002:a19:f86:: with SMTP id 6-v6mr12011987lfp.15.1528104280803; Mon, 04 Jun 2018 02:24:40 -0700 (PDT) Received: from sh.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id r11-v6sm9792477ljg.37.2018.06.04.02.24.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Jun 2018 02:24:39 -0700 (PDT) From: Tomasz Duszynski To: dev@dpdk.org Cc: nsamsono@marvell.com, jianbo.liu@arm.com, dima@marvell.com, mw@semihalf.com, Tomasz Duszynski Date: Mon, 4 Jun 2018 11:24:28 +0200 Message-Id: <1528104268-6179-1-git-send-email-tdu@semihalf.com> X-Mailer: git-send-email 2.7.4 Subject: [dpdk-dev] [PATCH] net/mvpp2: check pointer before using it 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" Avoid NULL dereference by checking pointer before using it. Note that the fixes tag is before the driver was renamed to mvpp2, so the patch will not apply that far back. Fixes: 3588aaa68eab ("net/mrvl: fix HIF objects allocation") Signed-off-by: Tomasz Duszynski --- drivers/net/mvpp2/mrvl_ethdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c index ae8804a..d5eb1fe 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.c +++ b/drivers/net/mvpp2/mrvl_ethdev.c @@ -1614,9 +1614,12 @@ mrvl_rx_queue_release(void *rxq) if (core_id == LCORE_ID_ANY) core_id = 0; + if (!q) + return; + hif = mrvl_get_hif(q->priv, core_id); - if (!q || !hif) + if (!hif) return; tc = q->priv->rxq_map[q->queue_id].tc;