[dpdk-stable] patch 'net/iavf/base: fix command buffer memory leak' has been queued to LTS release 18.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/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/ee7c6ac8635d308d3d2b719742fae2bfba3fde26

Thanks.

Kevin.

---
>From ee7c6ac8635d308d3d2b719742fae2bfba3fde26 Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang at intel.com>
Date: Tue, 3 Dec 2019 15:03:12 +0800
Subject: [PATCH] net/iavf/base: fix command buffer memory leak

[ upstream commit 87aca6d8d8a452ce0d3534dd80bab28ff8e66b58 ]

Allocated resources were not freed in the event of failure in
iavf_init_asq function. This patch gracefully handles all failures.

Fixes: e5b2a9e957e7 ("net/avf/base: add base code for avf PMD")

Signed-off-by: Pandi Kumar Maharajan <pandi.maharajan at intel.com>
Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr at intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
Acked-by: Qiming Yang <qiming.yang at intel.com>
---
 drivers/net/avf/base/avf_adminq.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/net/avf/base/avf_adminq.c b/drivers/net/avf/base/avf_adminq.c
index 616e2a9cce..71f18b3477 100644
--- a/drivers/net/avf/base/avf_adminq.c
+++ b/drivers/net/avf/base/avf_adminq.c
@@ -114,4 +114,5 @@ enum avf_status_code avf_alloc_adminq_arq_ring(struct avf_hw *hw)
 void avf_free_adminq_asq(struct avf_hw *hw)
 {
+	avf_free_virt_mem(hw, &hw->aq.asq.cmd_buf);
 	avf_free_dma_mem(hw, &hw->aq.asq.desc_buf);
 }
@@ -397,5 +398,5 @@ enum avf_status_code avf_init_asq(struct avf_hw *hw)
 	ret_code = avf_config_asq_regs(hw);
 	if (ret_code != AVF_SUCCESS)
-		goto init_adminq_free_rings;
+		goto init_config_regs;
 
 	/* success! */
@@ -405,4 +406,8 @@ enum avf_status_code avf_init_asq(struct avf_hw *hw)
 init_adminq_free_rings:
 	avf_free_adminq_asq(hw);
+	return ret_code;
+
+init_config_regs:
+	avf_free_asq_bufs(hw);
 
 init_adminq_exit:
-- 
2.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-07 15:08:18.518657985 +0000
+++ 0019-net-iavf-base-fix-command-buffer-memory-leak.patch	2020-02-07 15:08:17.527062777 +0000
@@ -1 +1 @@
-From 87aca6d8d8a452ce0d3534dd80bab28ff8e66b58 Mon Sep 17 00:00:00 2001
+From ee7c6ac8635d308d3d2b719742fae2bfba3fde26 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 87aca6d8d8a452ce0d3534dd80bab28ff8e66b58 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -17 +18 @@
- drivers/net/iavf/base/iavf_adminq.c | 7 ++++++-
+ drivers/net/avf/base/avf_adminq.c | 7 ++++++-
@@ -20,6 +21,6 @@
-diff --git a/drivers/net/iavf/base/iavf_adminq.c b/drivers/net/iavf/base/iavf_adminq.c
-index ef352ac4c4..298e77277e 100644
---- a/drivers/net/iavf/base/iavf_adminq.c
-+++ b/drivers/net/iavf/base/iavf_adminq.c
-@@ -83,4 +83,5 @@ enum iavf_status iavf_alloc_adminq_arq_ring(struct iavf_hw *hw)
- void iavf_free_adminq_asq(struct iavf_hw *hw)
+diff --git a/drivers/net/avf/base/avf_adminq.c b/drivers/net/avf/base/avf_adminq.c
+index 616e2a9cce..71f18b3477 100644
+--- a/drivers/net/avf/base/avf_adminq.c
++++ b/drivers/net/avf/base/avf_adminq.c
+@@ -114,4 +114,5 @@ enum avf_status_code avf_alloc_adminq_arq_ring(struct avf_hw *hw)
+ void avf_free_adminq_asq(struct avf_hw *hw)
@@ -27,2 +28,2 @@
-+	iavf_free_virt_mem(hw, &hw->aq.asq.cmd_buf);
- 	iavf_free_dma_mem(hw, &hw->aq.asq.desc_buf);
++	avf_free_virt_mem(hw, &hw->aq.asq.cmd_buf);
+ 	avf_free_dma_mem(hw, &hw->aq.asq.desc_buf);
@@ -30,3 +31,3 @@
-@@ -354,5 +355,5 @@ enum iavf_status iavf_init_asq(struct iavf_hw *hw)
- 	ret_code = iavf_config_asq_regs(hw);
- 	if (ret_code != IAVF_SUCCESS)
+@@ -397,5 +398,5 @@ enum avf_status_code avf_init_asq(struct avf_hw *hw)
+ 	ret_code = avf_config_asq_regs(hw);
+ 	if (ret_code != AVF_SUCCESS)
@@ -37 +38 @@
-@@ -362,4 +363,8 @@ enum iavf_status iavf_init_asq(struct iavf_hw *hw)
+@@ -405,4 +406,8 @@ enum avf_status_code avf_init_asq(struct avf_hw *hw)
@@ -39 +40 @@
- 	iavf_free_adminq_asq(hw);
+ 	avf_free_adminq_asq(hw);
@@ -43 +44 @@
-+	iavf_free_asq_bufs(hw);
++	avf_free_asq_bufs(hw);