From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id BBD14235 for ; Tue, 21 Nov 2017 14:23:53 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 622DF20B1F; Tue, 21 Nov 2017 08:23:53 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 21 Nov 2017 08:23:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=PIpfJVNkO7hmPmTyB Zqp00Wwd8U1Q2GUJQH3sc7Mgc8=; b=X/mbdvuZGk4PBuLaFXPvwV7Bcqt6VbKMz VdcRKaCHFC7ahkjUX+RxAGNAtLHGqzyM+km58PVq2Aqa2f+BfvVw3nQfAO3wj8XW n4Av2DOz36XuWLiRoAFFf342TAJ08oXqmXhtD0jz62JAEaw7HC/0Gb3be8ROurBR DJMFCgtCMq1mhGC7B8gPmeCrkrx+UnUjhdf1AlLj1pigY8PiQcvxiF1nqNCntn9a G2SlAmX6wgpVMJj5A7qx1yGQpQfaKi4fbfax8GZ+cjikcufmumfJJTG0FrsXPXis 6/C4oobcuhebhdNqk12oURZzcaEihxHR8jKrqFHslk/JTP2kX1Wkw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=PIpfJVNkO7hmPmTyBZqp00Wwd8U1Q2GUJQH3sc7Mgc8=; b=flGbCW// ZNtWHWboZCC2JgdNHg+zVLb4KuqHhkFQoF9i1q3WjVaQ7+jyAOtSeSUly/m28gNz U8yERVC5Zq5XhSAh4qVGaHoDCb4T/pyODHlOiOeUJdnZMczTE9KrGdxytHjgO2uH DEgsCXUDePMEf7hJ2Edb7fZYJqQ9u+1rIChVeMgN90sJxlyRUpZbTIz2BZlJEw3d Gp442Oo8zmWhc9l4z+1+bd2wlskTrpSrGTIxkLCw8bKwV9C3D8dl6RDMFhoU0aGv eb3aeTr2JsBMGeryT5BDyLXBBG9N8CrEhRbKOinxNt2MhSI+aINzdRsjS7PJPC+a aeOV0ZJSNrSU8g== X-ME-Sender: Received: from localhost.localdomain (unknown [180.158.62.0]) by mail.messagingengine.com (Postfix) with ESMTPA id D93B8248B4; Tue, 21 Nov 2017 08:23:48 -0500 (EST) From: Yuanhan Liu To: Michal Jastrzebski Cc: Tomasz Kulasek , Ferruh Yigit , dpdk stable Date: Tue, 21 Nov 2017 21:16:51 +0800 Message-Id: <1511270333-31002-69-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> References: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/vmxnet3: fix dereference before null check' has been queued to stable release 17.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Nov 2017 13:23:54 -0000 Hi, FYI, your patch has been queued to stable release 17.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/17. So please shout if anyone has objections. Thanks. --yliu --- >>From 0367d411ea10651d99c27d083df8c3149dfb266c Mon Sep 17 00:00:00 2001 From: Michal Jastrzebski Date: Fri, 29 Sep 2017 15:04:02 +0200 Subject: [PATCH] net/vmxnet3: fix dereference before null check [ upstream commit 4d0833e6f8d4c9814b0c8fa1a2f8ed2263ae4856 ] 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") 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 680da17..0c37de7 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]; -- 2.7.4