summaryrefslogtreecommitdiff
path: root/drivers/raw
diff options
context:
space:
mode:
authorAndy Pei <andy.pei@intel.com>2019-01-18 11:14:33 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-01-19 00:07:52 +0100
commit3c69149a21be9f21da4d36bcf851762d81e873c1 (patch)
treee18ad124304e911c6ed92ecb1f681ff42c9937d0 /drivers/raw
parentfb87e55abac808bdda60e114a6817ab6e812ec16 (diff)
downloaddpdk-next-eventdev-3c69149a21be9f21da4d36bcf851762d81e873c1.zip
dpdk-next-eventdev-3c69149a21be9f21da4d36bcf851762d81e873c1.tar.gz
dpdk-next-eventdev-3c69149a21be9f21da4d36bcf851762d81e873c1.tar.xz
raw/ifpga: fix memory leak
When ifpga_rawdev_create() allocate memory for a new rawdev, the original code allocate redundant memory for adapter, which is a member of the rawdev. What is actually necessary is the adapter to be initialized, not memory allocated. Fixes: ef1e8ede3da5 ("raw/ifpga: add Intel FPGA bus rawdev driver") Cc: stable@dpdk.org Signed-off-by: Andy Pei <andy.pei@intel.com> Acked-by: Tianfei Zhang <tianfei.zhang@intel.com> Acked-by: Rosen Xu <rosen.xu@intel.com>
Diffstat (limited to 'drivers/raw')
-rw-r--r--drivers/raw/ifpga_rawdev/base/opae_hw_api.c14
-rw-r--r--drivers/raw/ifpga_rawdev/base/opae_hw_api.h3
-rw-r--r--drivers/raw/ifpga_rawdev/ifpga_rawdev.c12
3 files changed, 13 insertions, 16 deletions
diff --git a/drivers/raw/ifpga_rawdev/base/opae_hw_api.c b/drivers/raw/ifpga_rawdev/base/opae_hw_api.c
index a533dfe..1541b67 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_hw_api.c
+++ b/drivers/raw/ifpga_rawdev/base/opae_hw_api.c
@@ -303,25 +303,25 @@ static struct opae_adapter_ops *match_ops(struct opae_adapter *adapter)
}
/**
- * opae_adapter_data_alloc - alloc opae_adapter_data data structure
+ * opae_adapter_init - init opae_adapter data structure
+ * @adapter: pointer of opae_adapter data structure
* @name: adapter name.
* @data: private data of this adapter.
*
- * Return: opae_adapter on success, otherwise NULL.
+ * Return: 0 on success.
*/
-struct opae_adapter *opae_adapter_alloc(const char *name, void *data)
+int opae_adapter_init(struct opae_adapter *adapter,
+ const char *name, void *data)
{
- struct opae_adapter *adapter = opae_zmalloc(sizeof(*adapter));
-
if (!adapter)
- return NULL;
+ return -ENOMEM;
TAILQ_INIT(&adapter->acc_list);
adapter->data = data;
adapter->name = name;
adapter->ops = match_ops(adapter);
- return adapter;
+ return 0;
}
/**
diff --git a/drivers/raw/ifpga_rawdev/base/opae_hw_api.h b/drivers/raw/ifpga_rawdev/base/opae_hw_api.h
index 4bbc9df..332e0f3 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_hw_api.h
+++ b/drivers/raw/ifpga_rawdev/base/opae_hw_api.h
@@ -225,7 +225,8 @@ struct opae_adapter {
void *opae_adapter_data_alloc(enum opae_adapter_type type);
#define opae_adapter_data_free(data) opae_free(data)
-struct opae_adapter *opae_adapter_alloc(const char *name, void *data);
+int opae_adapter_init(struct opae_adapter *adapter,
+ const char *name, void *data);
#define opae_adapter_free(adapter) opae_free(adapter)
int opae_adapter_enumerate(struct opae_adapter *adapter);
diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
index 32e318f..da772d0 100644
--- a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
+++ b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
@@ -409,9 +409,10 @@ ifpga_rawdev_create(struct rte_pci_device *pci_dev,
data->device_id = pci_dev->id.device_id;
data->vendor_id = pci_dev->id.vendor_id;
+ adapter = rawdev->dev_private;
/* create a opae_adapter based on above device data */
- adapter = opae_adapter_alloc(pci_dev->device.name, data);
- if (!adapter) {
+ ret = opae_adapter_init(adapter, pci_dev->device.name, data);
+ if (ret) {
ret = -ENOMEM;
goto free_adapter_data;
}
@@ -420,12 +421,10 @@ ifpga_rawdev_create(struct rte_pci_device *pci_dev,
rawdev->device = &pci_dev->device;
rawdev->driver_name = pci_dev->device.driver->name;
- rawdev->dev_private = adapter;
-
/* must enumerate the adapter before use it */
ret = opae_adapter_enumerate(adapter);
if (ret)
- goto free_adapter;
+ goto free_adapter_data;
/* get opae_manager to rawdev */
mgr = opae_adapter_get_mgr(adapter);
@@ -436,9 +435,6 @@ ifpga_rawdev_create(struct rte_pci_device *pci_dev,
return ret;
-free_adapter:
- if (adapter)
- opae_adapter_free(adapter);
free_adapter_data:
if (data)
opae_adapter_data_free(data);