From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 3E517A0096 for ; Wed, 8 May 2019 12:17:01 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 31CFB2862; Wed, 8 May 2019 12:17:01 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id C5C5F4C8F for ; Wed, 8 May 2019 12:16:58 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3687AC04FF86; Wed, 8 May 2019 10:16:58 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27913410E; Wed, 8 May 2019 10:16:56 +0000 (UTC) From: Kevin Traynor To: Abhinandan Gujjar Cc: Jerin Jacob , dpdk stable Date: Wed, 8 May 2019 11:15:24 +0100 Message-Id: <20190508101534.8984-42-ktraynor@redhat.com> In-Reply-To: <20190508101534.8984-1-ktraynor@redhat.com> References: <20190508101534.8984-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 08 May 2019 10:16:58 +0000 (UTC) Subject: [dpdk-stable] patch 'eventdev: fix crypto adapter' has been queued to LTS release 18.11.2 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/13/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/efa820160c149ce77ccb4f047df80bff234a3a4d Thanks. Kevin Traynor --- >From efa820160c149ce77ccb4f047df80bff234a3a4d Mon Sep 17 00:00:00 2001 From: Abhinandan Gujjar Date: Wed, 24 Apr 2019 22:04:38 +0530 Subject: [PATCH] eventdev: fix crypto adapter [ upstream commit 27e6cca81a6f77f1162e5f480d59b84483a4641f ] This patch fixes null pointer dereference and control flow issues reported in event crypto adapter by coverity Coverity issue: 279439, 279446, 279450, 279462 Fixes: 7901eac3409 ("eventdev: add crypto adapter implementation") Signed-off-by: Abhinandan Gujjar Acked-by: Jerin Jacob --- lib/librte_eventdev/rte_event_crypto_adapter.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/librte_eventdev/rte_event_crypto_adapter.c b/lib/librte_eventdev/rte_event_crypto_adapter.c index 11b28ca9b..5faf3c900 100644 --- a/lib/librte_eventdev/rte_event_crypto_adapter.c +++ b/lib/librte_eventdev/rte_event_crypto_adapter.c @@ -160,4 +160,7 @@ eca_default_config_cb(uint8_t id, uint8_t dev_id, struct rte_event_crypto_adapter *adapter = eca_id_to_adapter(id); + if (adapter == NULL) + return -EINVAL; + dev = &rte_eventdevs[adapter->eventdev_id]; dev_conf = dev->data->dev_conf; @@ -354,5 +357,5 @@ eca_enq_to_cryptodev(struct rte_event_crypto_adapter *adapter, qp_id = m_data->request_info.queue_pair_id; qp_info = &adapter->cdevs[cdev_id].qpairs[qp_id]; - if (qp_info == NULL) { + if (!qp_info->qp_enabled) { rte_pktmbuf_free(crypto_op->sym->m_src); rte_crypto_op_free(crypto_op); @@ -370,5 +373,5 @@ eca_enq_to_cryptodev(struct rte_event_crypto_adapter *adapter, qp_id = m_data->request_info.queue_pair_id; qp_info = &adapter->cdevs[cdev_id].qpairs[qp_id]; - if (qp_info == NULL) { + if (!qp_info->qp_enabled) { rte_pktmbuf_free(crypto_op->sym->m_src); rte_crypto_op_free(crypto_op); @@ -428,8 +431,7 @@ eca_crypto_enq_flush(struct rte_event_crypto_adapter *adapter) for (cdev_id = 0; cdev_id < num_cdev; cdev_id++) { curr_dev = &adapter->cdevs[cdev_id]; - if (curr_dev == NULL) - continue; dev = curr_dev->dev; - + if (dev == NULL) + continue; for (qp = 0; qp < dev->data->nb_queue_pairs; qp++) { @@ -580,7 +582,7 @@ eca_crypto_adapter_deq_run(struct rte_event_crypto_adapter *adapter, cdev_id < num_cdev; cdev_id++) { curr_dev = &adapter->cdevs[cdev_id]; - if (curr_dev == NULL) - continue; dev = curr_dev->dev; + if (dev == NULL) + continue; dev_qps = dev->data->nb_queue_pairs; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 11:05:07.917588504 +0100 +++ 0042-eventdev-fix-crypto-adapter.patch 2019-05-08 11:05:05.851932301 +0100 @@ -1 +1 @@ -From 27e6cca81a6f77f1162e5f480d59b84483a4641f Mon Sep 17 00:00:00 2001 +From efa820160c149ce77ccb4f047df80bff234a3a4d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 27e6cca81a6f77f1162e5f480d59b84483a4641f ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 9e99cf475..22d910816 100644 +index 11b28ca9b..5faf3c900 100644