From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 980251B48E for ; Thu, 22 Nov 2018 17:53:26 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0158980F8D; Thu, 22 Nov 2018 16:53:26 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 851A660FD9; Thu, 22 Nov 2018 16:53:24 +0000 (UTC) From: Kevin Traynor To: Fiona Trahe Cc: Arek Kusztal , dpdk stable Date: Thu, 22 Nov 2018 16:49:53 +0000 Message-Id: <20181122164957.13003-61-ktraynor@redhat.com> In-Reply-To: <20181122164957.13003-1-ktraynor@redhat.com> References: <20181122164957.13003-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 22 Nov 2018 16:53:26 +0000 (UTC) Subject: [dpdk-stable] patch 'common/qat: fix for invalid response from firmware' has been queued to stable release 18.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: Thu, 22 Nov 2018 16:53:27 -0000 Hi, FYI, your patch has been queued to stable release 18.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/28/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From 2ea575fce4957bc9d9a0ca04607f5676a473eb95 Mon Sep 17 00:00:00 2001 From: Fiona Trahe Date: Wed, 24 Oct 2018 00:39:42 +0100 Subject: [PATCH] common/qat: fix for invalid response from firmware [ upstream commit d09973f6c4dff9715304ef979c1b0d72aa365193 ] Check that the firmware response has a bit set indicating it's valid before dereferencing the rest of the response contents. Fixes: 0bdd36e12245 ("crypto/qat: make dequeue function generic") Signed-off-by: Fiona Trahe Acked-by: Arek Kusztal --- drivers/common/qat/qat_qp.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c index 7ca7a45eb..816166344 100644 --- a/drivers/common/qat/qat_qp.c +++ b/drivers/common/qat/qat_qp.c @@ -597,4 +597,5 @@ qat_dequeue_op_burst(void *qp, void **ops, uint16_t nb_ops) uint32_t resp_counter = 0; uint8_t *resp_msg; + uint8_t hdr_flags; rx_queue = &(tmp_qp->rx_q); @@ -602,8 +603,15 @@ qat_dequeue_op_burst(void *qp, void **ops, uint16_t nb_ops) head = rx_queue->head; resp_msg = (uint8_t *)rx_queue->base_addr + rx_queue->head; + hdr_flags = ((struct icp_qat_fw_comn_resp_hdr *)resp_msg)->hdr_flags; while (*(uint32_t *)resp_msg != ADF_RING_EMPTY_SIG && resp_counter != nb_ops) { + if (unlikely(!ICP_QAT_FW_COMN_VALID_FLAG_GET(hdr_flags))) { + /* Fatal firmware error */ + QAT_LOG(ERR, "QAT Firmware returned invalid response"); + return 0; + } + if (tmp_qp->service_type == QAT_SERVICE_SYMMETRIC) qat_sym_process_response(ops, resp_msg); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-22 16:47:33.872853107 +0000 +++ 0061-common-qat-fix-for-invalid-response-from-firmware.patch 2018-11-22 16:47:32.000000000 +0000 @@ -1,13 +1,14 @@ -From d09973f6c4dff9715304ef979c1b0d72aa365193 Mon Sep 17 00:00:00 2001 +From 2ea575fce4957bc9d9a0ca04607f5676a473eb95 Mon Sep 17 00:00:00 2001 From: Fiona Trahe Date: Wed, 24 Oct 2018 00:39:42 +0100 Subject: [PATCH] common/qat: fix for invalid response from firmware +[ upstream commit d09973f6c4dff9715304ef979c1b0d72aa365193 ] + Check that the firmware response has a bit set indicating it's valid before dereferencing the rest of the response contents. Fixes: 0bdd36e12245 ("crypto/qat: make dequeue function generic") -Cc: stable@dpdk.org Signed-off-by: Fiona Trahe Acked-by: Arek Kusztal @@ -16,16 +17,16 @@ 1 file changed, 8 insertions(+) diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c -index ec7f2b309..79f6a01ba 100644 +index 7ca7a45eb..816166344 100644 --- a/drivers/common/qat/qat_qp.c +++ b/drivers/common/qat/qat_qp.c -@@ -635,4 +635,5 @@ qat_dequeue_op_burst(void *qp, void **ops, uint16_t nb_ops) +@@ -597,4 +597,5 @@ qat_dequeue_op_burst(void *qp, void **ops, uint16_t nb_ops) uint32_t resp_counter = 0; uint8_t *resp_msg; + uint8_t hdr_flags; rx_queue = &(tmp_qp->rx_q); -@@ -640,8 +641,15 @@ qat_dequeue_op_burst(void *qp, void **ops, uint16_t nb_ops) +@@ -602,8 +603,15 @@ qat_dequeue_op_burst(void *qp, void **ops, uint16_t nb_ops) head = rx_queue->head; resp_msg = (uint8_t *)rx_queue->base_addr + rx_queue->head; + hdr_flags = ((struct icp_qat_fw_comn_resp_hdr *)resp_msg)->hdr_flags;