[dpdk-stable] patch 'baseband/turbo_sw: fix memory leak in error path' has been queued to stable release 19.11.6
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Mon Nov 9 19:40:05 CET 2020
Hi,
FYI, your patch has been queued to stable release 19.11.6
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/11/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/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/a973d06b4f47609fb3ef4fc483bc483a57ee1c61
Thanks.
Luca Boccassi
---
>From a973d06b4f47609fb3ef4fc483bc483a57ee1c61 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
Date: Thu, 15 Oct 2020 21:45:45 +0800
Subject: [PATCH] baseband/turbo_sw: fix memory leak in error path
[ upstream commit 240fb56cdb8a4d48359f83b2cb856410016b9207 ]
In q_setup() allocated memory for the queue data, we should free
it when error happens, otherwise it will lead to memory leak.
Fixes: b8cfe2c9aed2 ("bb/turbo_sw: add software turbo driver")
Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
Reviewed-by: Nicolas Chautru <nicolas.chautru at intel.com>
---
.../baseband/turbo_sw/bbdev_turbo_software.c | 35 ++++++++++++++-----
1 file changed, 26 insertions(+), 9 deletions(-)
diff --git a/drivers/baseband/turbo_sw/bbdev_turbo_software.c b/drivers/baseband/turbo_sw/bbdev_turbo_software.c
index e6d9501240..18c4649917 100644
--- a/drivers/baseband/turbo_sw/bbdev_turbo_software.c
+++ b/drivers/baseband/turbo_sw/bbdev_turbo_software.c
@@ -10,6 +10,7 @@
#include <rte_ring.h>
#include <rte_kvargs.h>
#include <rte_cycles.h>
+#include <rte_errno.h>
#include <rte_bbdev.h>
#include <rte_bbdev_pmd.h>
@@ -303,7 +304,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
rte_bbdev_log(ERR,
"Creating queue name for device %u queue %u failed",
dev->data->dev_id, q_id);
- return -ENAMETOOLONG;
+ ret = -ENAMETOOLONG;
+ goto free_q;
}
q->enc_out = rte_zmalloc_socket(name,
((RTE_BBDEV_TURBO_MAX_TB_SIZE >> 3) + 3) *
@@ -312,6 +314,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
if (q->enc_out == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name);
+ ret = -ENOMEM;
goto free_q;
}
@@ -323,7 +326,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
rte_bbdev_log(ERR,
"Creating queue name for device %u queue %u failed",
dev->data->dev_id, q_id);
- return -ENAMETOOLONG;
+ ret = -ENAMETOOLONG;
+ goto free_q;
}
q->enc_in = rte_zmalloc_socket(name,
(RTE_BBDEV_LDPC_MAX_CB_SIZE >> 3) * sizeof(*q->enc_in),
@@ -331,6 +335,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
if (q->enc_in == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name);
+ ret = -ENOMEM;
goto free_q;
}
@@ -341,7 +346,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
rte_bbdev_log(ERR,
"Creating queue name for device %u queue %u failed",
dev->data->dev_id, q_id);
- return -ENAMETOOLONG;
+ ret = -ENAMETOOLONG;
+ goto free_q;
}
q->ag = rte_zmalloc_socket(name,
RTE_BBDEV_TURBO_MAX_CB_SIZE * 10 * sizeof(*q->ag),
@@ -349,6 +355,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
if (q->ag == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name);
+ ret = -ENOMEM;
goto free_q;
}
@@ -359,7 +366,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
rte_bbdev_log(ERR,
"Creating queue name for device %u queue %u failed",
dev->data->dev_id, q_id);
- return -ENAMETOOLONG;
+ ret = -ENAMETOOLONG;
+ goto free_q;
}
q->code_block = rte_zmalloc_socket(name,
RTE_BBDEV_TURBO_MAX_CB_SIZE * sizeof(*q->code_block),
@@ -367,6 +375,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
if (q->code_block == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name);
+ ret = -ENOMEM;
goto free_q;
}
@@ -378,7 +387,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
rte_bbdev_log(ERR,
"Creating queue name for device %u queue %u failed",
dev->data->dev_id, q_id);
- return -ENAMETOOLONG;
+ ret = -ENAMETOOLONG;
+ goto free_q;
}
q->deint_input = rte_zmalloc_socket(name,
DEINT_INPUT_BUF_SIZE * sizeof(*q->deint_input),
@@ -386,6 +396,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
if (q->deint_input == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name);
+ ret = -ENOMEM;
goto free_q;
}
@@ -397,7 +408,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
rte_bbdev_log(ERR,
"Creating queue name for device %u queue %u failed",
dev->data->dev_id, q_id);
- return -ENAMETOOLONG;
+ ret = -ENAMETOOLONG;
+ goto free_q;
}
q->deint_output = rte_zmalloc_socket(NULL,
DEINT_OUTPUT_BUF_SIZE * sizeof(*q->deint_output),
@@ -405,6 +417,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
if (q->deint_output == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name);
+ ret = -ENOMEM;
goto free_q;
}
@@ -416,7 +429,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
rte_bbdev_log(ERR,
"Creating queue name for device %u queue %u failed",
dev->data->dev_id, q_id);
- return -ENAMETOOLONG;
+ ret = -ENAMETOOLONG;
+ goto free_q;
}
q->adapter_output = rte_zmalloc_socket(NULL,
ADAPTER_OUTPUT_BUF_SIZE * sizeof(*q->adapter_output),
@@ -424,6 +438,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
if (q->adapter_output == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name);
+ ret = -ENOMEM;
goto free_q;
}
@@ -434,12 +449,14 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
rte_bbdev_log(ERR,
"Creating queue name for device %u queue %u failed",
dev->data->dev_id, q_id);
- return -ENAMETOOLONG;
+ ret = -ENAMETOOLONG;
+ goto free_q;
}
q->processed_pkts = rte_ring_create(name, queue_conf->queue_size,
queue_conf->socket, RING_F_SP_ENQ | RING_F_SC_DEQ);
if (q->processed_pkts == NULL) {
rte_bbdev_log(ERR, "Failed to create ring for %s", name);
+ ret = -rte_errno;
goto free_q;
}
@@ -459,7 +476,7 @@ free_q:
rte_free(q->deint_output);
rte_free(q->adapter_output);
rte_free(q);
- return -EFAULT;
+ return ret;
}
static const struct rte_bbdev_ops pmd_ops = {
--
2.27.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-11-09 18:40:11.896932363 +0000
+++ 0017-baseband-turbo_sw-fix-memory-leak-in-error-path.patch 2020-11-09 18:40:11.091310660 +0000
@@ -1 +1 @@
-From 240fb56cdb8a4d48359f83b2cb856410016b9207 Mon Sep 17 00:00:00 2001
+From a973d06b4f47609fb3ef4fc483bc483a57ee1c61 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 240fb56cdb8a4d48359f83b2cb856410016b9207 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index a36099e91d..aa7f122382 100644
+index e6d9501240..18c4649917 100644
@@ -30 +31 @@
-@@ -302,7 +303,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
+@@ -303,7 +304,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
@@ -40 +41 @@
-@@ -311,6 +313,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
+@@ -312,6 +314,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
@@ -48 +49 @@
-@@ -322,7 +325,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
+@@ -323,7 +326,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
@@ -58 +59 @@
-@@ -330,6 +334,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
+@@ -331,6 +335,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
@@ -66 +67 @@
-@@ -340,7 +345,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
+@@ -341,7 +346,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
@@ -76 +77 @@
-@@ -348,6 +354,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
+@@ -349,6 +355,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
@@ -84 +85 @@
-@@ -358,7 +365,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
+@@ -359,7 +366,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
@@ -94 +95 @@
-@@ -366,6 +374,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
+@@ -367,6 +375,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
@@ -102 +103 @@
-@@ -377,7 +386,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
+@@ -378,7 +387,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
@@ -112 +113 @@
-@@ -385,6 +395,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
+@@ -386,6 +396,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
@@ -120 +121 @@
-@@ -396,7 +407,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
+@@ -397,7 +408,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
@@ -130 +131 @@
-@@ -404,6 +416,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
+@@ -405,6 +417,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
@@ -138 +139 @@
-@@ -415,7 +428,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
+@@ -416,7 +429,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
@@ -148 +149 @@
-@@ -423,6 +437,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
+@@ -424,6 +438,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
@@ -156 +157 @@
-@@ -433,12 +448,14 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
+@@ -434,12 +449,14 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
@@ -172 +173 @@
-@@ -458,7 +475,7 @@ free_q:
+@@ -459,7 +476,7 @@ free_q:
More information about the stable
mailing list