[dpdk-stable] patch 'common/qat: fix for invalid response from firmware' has been queued to stable release 18.08.1

[Kevin Traynor]

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 <fiona.trahe at intel.com>
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 <fiona.trahe at intel.com>
Acked-by: Arek Kusztal <arkadiuszx.kusztal at intel.com>
---
 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 <fiona.trahe at intel.com>
 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 at dpdk.org
 
 Signed-off-by: Fiona Trahe <fiona.trahe at intel.com>
 Acked-by: Arek Kusztal <arkadiuszx.kusztal at intel.com>
@@ -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;