[dpdk-stable] patch 'net/ena/base: fix release of wait event' has been queued to LTS release 18.11.11

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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/10/20. 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/dfb132c50eee506eed2507611b08c7fef616f6e2

Thanks.

Kevin.

---
>From dfb132c50eee506eed2507611b08c7fef616f6e2 Mon Sep 17 00:00:00 2001
From: Michal Krawczyk <mk at semihalf.com>
Date: Thu, 17 Sep 2020 07:30:20 +0200
Subject: [PATCH] net/ena/base: fix release of wait event

[ upstream commit f034d4bb973a23e6dd2af8acdc3829b013962e47 ]

The wait event is being accessed without making sure it the completion
context exists. The check for that is just below, so it could be used
for releasing wait even safely.

Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version")

Signed-off-by: Michal Krawczyk <mk at semihalf.com>
Reviewed-by: Igor Chauskin <igorch at amazon.com>
Reviewed-by: Guy Tzalik <gtzalik at amazon.com>
Reviewed-by: Stephen Hemminger <stephen at networkplumber.org>
---
 drivers/net/ena/base/ena_com.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c
index 19eec493ed..f7a6711d40 100644
--- a/drivers/net/ena/base/ena_com.c
+++ b/drivers/net/ena/base/ena_com.c
@@ -1483,7 +1483,9 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev)
 	u16 size;
 
-	ENA_WAIT_EVENT_DESTROY(admin_queue->comp_ctx->wait_event);
-	if (admin_queue->comp_ctx)
+	if (admin_queue->comp_ctx) {
+		ENA_WAIT_EVENT_DESTROY(admin_queue->comp_ctx->wait_event);
 		ENA_MEM_FREE(ena_dev->dmadev, admin_queue->comp_ctx);
+	}
+
 	admin_queue->comp_ctx = NULL;
 	size = ADMIN_SQ_SIZE(admin_queue->q_depth);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.683715451 +0000
+++ 0023-net-ena-base-fix-release-of-wait-event.patch	2020-11-05 12:38:54.184895976 +0000
@@ -1 +1 @@
-From f034d4bb973a23e6dd2af8acdc3829b013962e47 Mon Sep 17 00:00:00 2001
+From dfb132c50eee506eed2507611b08c7fef616f6e2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f034d4bb973a23e6dd2af8acdc3829b013962e47 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index b4e54318c6..ce239ab164 100644
+index 19eec493ed..f7a6711d40 100644
@@ -25 +26 @@
-@@ -1656,9 +1656,11 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev)
+@@ -1483,7 +1483,9 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev)
@@ -32,3 +33 @@
- 		ENA_MEM_FREE(ena_dev->dmadev,
- 			     admin_queue->comp_ctx,
- 			     (admin_queue->q_depth * sizeof(struct ena_comp_ctx)));
+ 		ENA_MEM_FREE(ena_dev->dmadev, admin_queue->comp_ctx);