From patchwork Fri Sep 29 13:04:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Jastrzebski X-Patchwork-Id: 29433 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 030A92661; Fri, 29 Sep 2017 15:05:36 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 1080F16E; Fri, 29 Sep 2017 15:05:33 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Sep 2017 06:05:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.42,452,1500966000"; d="scan'208"; a="1177012069" Received: from unknown ([10.103.103.177]) by orsmga001.jf.intel.com with SMTP; 29 Sep 2017 06:05:29 -0700 Received: by (sSMTP sendmail emulation); Fri, 29 Sep 2017 15:04:04 +0200 From: Michal Jastrzebski To: skhare@vmware.com Cc: dev@dpdk.org, deepak.k.jain@intel.com, ferruh.yigit@intel.com, Michal Jastrzebski , yongwang@vmware.com, stable@dpdk.org, Tomasz Kulasek Date: Fri, 29 Sep 2017 15:04:02 +0200 Message-Id: <20170929130402.32196-1-michalx.k.jastrzebski@intel.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170922123906.13308-1-michalx.k.jastrzebski@intel.com> References: <20170922123906.13308-1-michalx.k.jastrzebski@intel.com> Subject: [dpdk-dev] [PATCH v2] net/vmxnet3: fix dereference before null check 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" Coverity reports check_after_deref: Null-checking rq suggests that it may be null, but it has already been dereferenced on all paths leading to the check. This patch removes NULL checking of "rq" from function vmxnet3_dev_rx_queue_reset as it is already checked against NULL one level up the callstack (function vmxnet3_dev_clear_queues). Coverity issue: 143468 Fixes: 5aecdc17a97d ("vmxnet3: fix stop/restart") Cc: yongwang@vmware.com Cc: stable@dpdk.org Signed-off-by: Tomasz Kulasek Signed-off-by: Michal Jastrzebski Reviewed-by: Ferruh Yigit --- drivers/net/vmxnet3/vmxnet3_rxtx.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index d9cf437..0f8cfff 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -265,11 +265,9 @@ vmxnet3_dev_rx_queue_reset(void *rxq) struct vmxnet3_rx_data_ring *data_ring = &rq->data_ring; int size; - if (rq != NULL) { - /* Release both the cmd_rings mbufs */ - for (i = 0; i < VMXNET3_RX_CMDRING_SIZE; i++) - vmxnet3_rx_cmd_ring_release_mbufs(&rq->cmd_ring[i]); - } + /* Release both the cmd_rings mbufs */ + for (i = 0; i < VMXNET3_RX_CMDRING_SIZE; i++) + vmxnet3_rx_cmd_ring_release_mbufs(&rq->cmd_ring[i]); ring0 = &rq->cmd_ring[0]; ring1 = &rq->cmd_ring[1];