raw/ifpga: fix a memory leak bug in /driver/raw/ifpga_rawdev
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.
--- drivers/raw/ifpga_rawdev/base/opae_hw_api.c | 14 +++++++------- drivers/raw/ifpga_rawdev/base/opae_hw_api.h | 3 ++- drivers/raw/ifpga_rawdev/ifpga_rawdev.c | 12 ++++-------- 3 files changed, 13 insertions(+), 16 deletions(-)
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +7 -7
@@ -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 ; }/**
drivers/raw/ifpga_rawdev/base/opae_hw_api.h +2 -1
@@ -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);
drivers/raw/ifpga_rawdev/ifpga_rawdev.c +4 -8
@@ -409,9 +409,10 @@ 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 @@ 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 @@return ret; -free_adapter: -if (adapter) -opae_adapter_free (adapter); free_adapter_data:if (data)opae_adapter_data_free (data);
Signature · 1 line
1.8.3.1
PATCH v2 1/1 raw/ifpga: fix a memory leak bug in /driver/raw/ifpga_rawdev
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.
---
v2:
* Remove [DPDK] prefix.
* Cc: [email protected]
drivers/raw/ifpga_rawdev/base/opae_hw_api.c | 14 +++++++------- drivers/raw/ifpga_rawdev/base/opae_hw_api.h | 3 ++- drivers/raw/ifpga_rawdev/ifpga_rawdev.c | 12 ++++-------- 3 files changed, 13 insertions(+), 16 deletions(-)
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +7 -7
@@ -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 ; }/**
drivers/raw/ifpga_rawdev/base/opae_hw_api.h +2 -1
@@ -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);
drivers/raw/ifpga_rawdev/ifpga_rawdev.c +4 -8
@@ -409,9 +409,10 @@ 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 @@ 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 @@return ret; -free_adapter: -if (adapter) -opae_adapter_free (adapter); free_adapter_data:if (data)opae_adapter_data_free (data);
Signature · 1 line
1.8.3.1
PATCH v3 1/1 raw/ifpga: fix memory leak
From: Andy Pei <[email protected]>
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.
---
Cc: [email protected]
--- drivers/raw/ifpga_rawdev/base/opae_hw_api.c | 14 +++++++------- drivers/raw/ifpga_rawdev/base/opae_hw_api.h | 3 ++- drivers/raw/ifpga_rawdev/ifpga_rawdev.c | 12 ++++-------- 3 files changed, 13 insertions(+), 16 deletions(-)
drivers/raw/ifpga_rawdev/base/opae_hw_api.c +7 -7
@@ -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 ; }/**
drivers/raw/ifpga_rawdev/base/opae_hw_api.h +2 -1
@@ -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);
drivers/raw/ifpga_rawdev/ifpga_rawdev.c +4 -8
@@ -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);
Signature · 1 line
2.17.2
Thomas Monjalon
AppliedRe: [PATCH v3] raw/ifpga: fix memory leak
18/01/2019 12:14, Ferruh Yigit:
Quoted 7 lines
From: Andy Pei <[email protected]>
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.
Quoted 6 lines
Fixes ef1e8ede3da5 ("raw/ifpga: add Intel FPGA bus rawdev driver")Signed-off-by Andy Pei <[email protected]>Acked-by Tianfei zhang <[email protected]>Acked-by Rosen Xu <[email protected]>
Applied, thanks