d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

baseband/turbo_sw: fix memory leak in error path

Browse Source 
In q_setup() allocated memory for the queue data, we should free
it when error happens, otherwise it will lead to memory leak.

Fixes: b8cfe2c9ae ("bb/turbo_sw: add software turbo driver")
Cc: stable@dpdk.org

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Reviewed-by: Nicolas Chautru <nicolas.chautru@intel.com>
This commit is contained in:
Yunjian Wang 2020-10-15 21:45:45 +08:00 committed by Akhil Goyal
parent 57e03d2a62
commit 240fb56cdb
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/baseband/turbo_sw/bbdev_turbo_software.c
View File

@ -10,6 +10,7 @@
#include <rte_ring.h> #include <rte_ring.h>
#include <rte_kvargs.h> #include <rte_kvargs.h>
#include <rte_cycles.h> #include <rte_cycles.h>
#include <rte_errno.h>
#include <rte_bbdev.h> #include <rte_bbdev.h>
#include <rte_bbdev_pmd.h> #include <rte_bbdev_pmd.h>
@ -302,7 +303,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
rte_bbdev_log(ERR, rte_bbdev_log(ERR,
"Creating queue name for device %u queue %u failed", "Creating queue name for device %u queue %u failed",
dev->data->dev_id, q_id); dev->data->dev_id, q_id);
return -ENAMETOOLONG; ret = -ENAMETOOLONG;
goto free_q;
} }
q->enc_out = rte_zmalloc_socket(name, q->enc_out = rte_zmalloc_socket(name,
((RTE_BBDEV_TURBO_MAX_TB_SIZE >> 3) + 3) * ((RTE_BBDEV_TURBO_MAX_TB_SIZE >> 3) + 3) *
@ -311,6 +313,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
if (q->enc_out == NULL) { if (q->enc_out == NULL) {
rte_bbdev_log(ERR, rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name); "Failed to allocate queue memory for %s", name);
ret = -ENOMEM;
goto free_q; goto free_q;
} }
@ -322,7 +325,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
rte_bbdev_log(ERR, rte_bbdev_log(ERR,
"Creating queue name for device %u queue %u failed", "Creating queue name for device %u queue %u failed",
dev->data->dev_id, q_id); dev->data->dev_id, q_id);
return -ENAMETOOLONG; ret = -ENAMETOOLONG;
goto free_q;
} }
q->enc_in = rte_zmalloc_socket(name, q->enc_in = rte_zmalloc_socket(name,
(RTE_BBDEV_LDPC_MAX_CB_SIZE >> 3) * sizeof(*q->enc_in), (RTE_BBDEV_LDPC_MAX_CB_SIZE >> 3) * sizeof(*q->enc_in),
@ -330,6 +334,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
if (q->enc_in == NULL) { if (q->enc_in == NULL) {
rte_bbdev_log(ERR, rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name); "Failed to allocate queue memory for %s", name);
ret = -ENOMEM;
goto free_q; goto free_q;
} }
@ -340,7 +345,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
rte_bbdev_log(ERR, rte_bbdev_log(ERR,
"Creating queue name for device %u queue %u failed", "Creating queue name for device %u queue %u failed",
dev->data->dev_id, q_id); dev->data->dev_id, q_id);
return -ENAMETOOLONG; ret = -ENAMETOOLONG;
goto free_q;
} }
q->ag = rte_zmalloc_socket(name, q->ag = rte_zmalloc_socket(name,
RTE_BBDEV_TURBO_MAX_CB_SIZE * 10 * sizeof(*q->ag), RTE_BBDEV_TURBO_MAX_CB_SIZE * 10 * sizeof(*q->ag),
@ -348,6 +354,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
if (q->ag == NULL) { if (q->ag == NULL) {
rte_bbdev_log(ERR, rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name); "Failed to allocate queue memory for %s", name);
ret = -ENOMEM;
goto free_q; goto free_q;
} }
@ -358,7 +365,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
rte_bbdev_log(ERR, rte_bbdev_log(ERR,
"Creating queue name for device %u queue %u failed", "Creating queue name for device %u queue %u failed",
dev->data->dev_id, q_id); dev->data->dev_id, q_id);
return -ENAMETOOLONG; ret = -ENAMETOOLONG;
goto free_q;
} }
q->code_block = rte_zmalloc_socket(name, q->code_block = rte_zmalloc_socket(name,
RTE_BBDEV_TURBO_MAX_CB_SIZE * sizeof(*q->code_block), RTE_BBDEV_TURBO_MAX_CB_SIZE * sizeof(*q->code_block),
@ -366,6 +374,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
if (q->code_block == NULL) { if (q->code_block == NULL) {
rte_bbdev_log(ERR, rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name); "Failed to allocate queue memory for %s", name);
ret = -ENOMEM;
goto free_q; goto free_q;
} }
@ -377,7 +386,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
rte_bbdev_log(ERR, rte_bbdev_log(ERR,
"Creating queue name for device %u queue %u failed", "Creating queue name for device %u queue %u failed",
dev->data->dev_id, q_id); dev->data->dev_id, q_id);
return -ENAMETOOLONG; ret = -ENAMETOOLONG;
goto free_q;
} }
q->deint_input = rte_zmalloc_socket(name, q->deint_input = rte_zmalloc_socket(name,
DEINT_INPUT_BUF_SIZE * sizeof(*q->deint_input), DEINT_INPUT_BUF_SIZE * sizeof(*q->deint_input),
@ -385,6 +395,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
if (q->deint_input == NULL) { if (q->deint_input == NULL) {
rte_bbdev_log(ERR, rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name); "Failed to allocate queue memory for %s", name);
ret = -ENOMEM;
goto free_q; goto free_q;
} }
@ -396,7 +407,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
rte_bbdev_log(ERR, rte_bbdev_log(ERR,
"Creating queue name for device %u queue %u failed", "Creating queue name for device %u queue %u failed",
dev->data->dev_id, q_id); dev->data->dev_id, q_id);
return -ENAMETOOLONG; ret = -ENAMETOOLONG;
goto free_q;
} }
q->deint_output = rte_zmalloc_socket(NULL, q->deint_output = rte_zmalloc_socket(NULL,
DEINT_OUTPUT_BUF_SIZE * sizeof(*q->deint_output), DEINT_OUTPUT_BUF_SIZE * sizeof(*q->deint_output),
@ -404,6 +416,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
if (q->deint_output == NULL) { if (q->deint_output == NULL) {
rte_bbdev_log(ERR, rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name); "Failed to allocate queue memory for %s", name);
ret = -ENOMEM;
goto free_q; goto free_q;
} }
@ -415,7 +428,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
rte_bbdev_log(ERR, rte_bbdev_log(ERR,
"Creating queue name for device %u queue %u failed", "Creating queue name for device %u queue %u failed",
dev->data->dev_id, q_id); dev->data->dev_id, q_id);
return -ENAMETOOLONG; ret = -ENAMETOOLONG;
goto free_q;
} }
q->adapter_output = rte_zmalloc_socket(NULL, q->adapter_output = rte_zmalloc_socket(NULL,
ADAPTER_OUTPUT_BUF_SIZE * sizeof(*q->adapter_output), ADAPTER_OUTPUT_BUF_SIZE * sizeof(*q->adapter_output),
@ -423,6 +437,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
if (q->adapter_output == NULL) { if (q->adapter_output == NULL) {
rte_bbdev_log(ERR, rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name); "Failed to allocate queue memory for %s", name);
ret = -ENOMEM;
goto free_q; goto free_q;
} }
@ -433,12 +448,14 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
rte_bbdev_log(ERR, rte_bbdev_log(ERR,
"Creating queue name for device %u queue %u failed", "Creating queue name for device %u queue %u failed",
dev->data->dev_id, q_id); dev->data->dev_id, q_id);
return -ENAMETOOLONG; ret = -ENAMETOOLONG;
goto free_q;
} }
q->processed_pkts = rte_ring_create(name, queue_conf->queue_size, q->processed_pkts = rte_ring_create(name, queue_conf->queue_size,
queue_conf->socket, RING_F_SP_ENQ | RING_F_SC_DEQ); queue_conf->socket, RING_F_SP_ENQ | RING_F_SC_DEQ);
if (q->processed_pkts == NULL) { if (q->processed_pkts == NULL) {
rte_bbdev_log(ERR, "Failed to create ring for %s", name); rte_bbdev_log(ERR, "Failed to create ring for %s", name);
ret = -rte_errno;
goto free_q; goto free_q;
} }
@ -458,7 +475,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
rte_free(q->deint_output); rte_free(q->deint_output);
rte_free(q->adapter_output); rte_free(q->adapter_output);
rte_free(q); rte_free(q);
return -EFAULT; return ret;
} }
static const struct rte_bbdev_ops pmd_ops = { static const struct rte_bbdev_ops pmd_ops = {