Re: [PATCH v2 1/5] mm, swap: Fix memory leak in setup_clusters() error path

[Baoquan He <bhe@redhat.com>]

On 10/31/25 at 03:50pm, Youngjun Park wrote:
> The setup_clusters() function could leak 'cluster_info' memory if an
> error occurred on a path that did not jump to the 'err_free' label.
> 
> This patch simplifies the error handling by removing the goto label
> and instead calling free_cluster_info() on all error exit paths.
> 
> The new logic is safe, as free_cluster_info() already handles NULL
> pointer inputs.
> 
> Fixes: 07adc4cf1ecd ("mm, swap: implement dynamic allocation of swap table")
> Signed-off-by: Youngjun Park <youngjun.park@lge.com>
> Reviewed-by: Kairui Song <kasong@tencent.com>
> 
> diff --git a/mm/swapfile.c b/mm/swapfile.c
> index c35bb8593f50..ed2c8e4edb71 100644
> --- a/mm/swapfile.c
> +++ b/mm/swapfile.c

LGTM,

Reviewed-by: Baoquan He <bhe@redhat.com>

> @@ -3324,7 +3324,7 @@ static struct swap_cluster_info *setup_clusters(struct swap_info_struct *si,
>  		si->global_cluster = kmalloc(sizeof(*si->global_cluster),
>  				     GFP_KERNEL);
>  		if (!si->global_cluster)
> -			goto err_free;
> +			goto err;
>  		for (i = 0; i < SWAP_NR_ORDERS; i++)
>  			si->global_cluster->next[i] = SWAP_ENTRY_INVALID;
>  		spin_lock_init(&si->global_cluster_lock);
> @@ -3377,9 +3377,8 @@ static struct swap_cluster_info *setup_clusters(struct swap_info_struct *si,
>  	}
>  
>  	return cluster_info;
> -err_free:
> -	free_cluster_info(cluster_info, maxpages);
>  err:
> +	free_cluster_info(cluster_info, maxpages);
>  	return ERR_PTR(err);
>  }
>  
> -- 
> 2.34.1
>