vfio/pds: Potential memory leak in pds_vfio_dirty_enable()

[PATCH] vfio/pds: Potential memory leak in pds_vfio_dirty_enable()

Posted by Cong Liu 1 year, 11 months ago

the patch releases the region_info memory if the interval_tree_iter_first()
function fails.

Signed-off-by: Cong Liu <liucong2@kylinos.cn>
---
 drivers/vfio/pci/pds/dirty.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/vfio/pci/pds/dirty.c b/drivers/vfio/pci/pds/dirty.c
index 8ddf4346fcd5..67919b5db127 100644
--- a/drivers/vfio/pci/pds/dirty.c
+++ b/drivers/vfio/pci/pds/dirty.c
@@ -291,8 +291,11 @@ static int pds_vfio_dirty_enable(struct pds_vfio_pci_device *pds_vfio,
 	len = num_ranges * sizeof(*region_info);
 
 	node = interval_tree_iter_first(ranges, 0, ULONG_MAX);
-	if (!node)
-		return -EINVAL;
+	if (!node) {
+		err = -EINVAL;
+		goto out_free_region_info;
+	}
+
 	for (int i = 0; i < num_ranges; i++) {
 		struct pds_lm_dirty_region_info *ri = &region_info[i];
 		u64 region_size = node->last - node->start + 1;
-- 
2.34.1

Re: [PATCH] vfio/pds: Potential memory leak in pds_vfio_dirty_enable()

Posted by Brett Creeley 1 year, 11 months ago

On 1/22/2024 5:13 PM, Cong Liu wrote:
> Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding.
> 
> 
> the patch releases the region_info memory if the interval_tree_iter_first()
> function fails.
> 
> Signed-off-by: Cong Liu <liucong2@kylinos.cn>
> ---
>   drivers/vfio/pci/pds/dirty.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/vfio/pci/pds/dirty.c b/drivers/vfio/pci/pds/dirty.c
> index 8ddf4346fcd5..67919b5db127 100644
> --- a/drivers/vfio/pci/pds/dirty.c
> +++ b/drivers/vfio/pci/pds/dirty.c
> @@ -291,8 +291,11 @@ static int pds_vfio_dirty_enable(struct pds_vfio_pci_device *pds_vfio,
>          len = num_ranges * sizeof(*region_info);
> 
>          node = interval_tree_iter_first(ranges, 0, ULONG_MAX);
> -       if (!node)
> -               return -EINVAL;
> +       if (!node) {
> +               err = -EINVAL;
> +               goto out_free_region_info;
> +       }
> +

LGTM! Thanks for fixing this.

Reviewed-by: <brett.creeley@amd.com>

>          for (int i = 0; i < num_ranges; i++) {
>                  struct pds_lm_dirty_region_info *ri = &region_info[i];
>                  u64 region_size = node->last - node->start + 1;
> --
> 2.34.1
>

RE: [PATCH] vfio/pds: Potential memory leak in pds_vfio_dirty_enable()

Posted by Tian, Kevin 1 year, 11 months ago

> From: Cong Liu <liucong2@kylinos.cn>
> Sent: Tuesday, January 23, 2024 9:13 AM
> 
> the patch releases the region_info memory if the interval_tree_iter_first()
> function fails.
> 
> Signed-off-by: Cong Liu <liucong2@kylinos.cn>

Reviewed-by: Kevin Tian <kevin.tian@intel.com>