Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1725792

Re: [PATCH] mm: kvfree the swap cluster info if the swap file is unsatisfactory

Show all headers | View raw

David Rientjes <rientjes@google.com> writes:

> On Thu, 31 Aug 2017, Darrick J. Wong wrote:
>
>> If initializing a small swap file fails because the swap file has a
>> problem (holes, etc.) then we need to free the cluster info as part of
>> cleanup.  Unfortunately a previous patch changed the code to use
>> kvzalloc but did not change all the vfree calls to use kvfree.
>> 
>
> Hopefully this can make it into 4.13.
>
> Fixes: 54f180d3c181 ("mm, swap: use kvzalloc to allocate some swap data structures")
> Cc: stable@vger.kernel.org [4.12]
>
>> Found by running generic/357 from xfstests.
>> 
>> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
>
> Acked-by: David Rientjes <rientjes@google.com>
>
> But I think there's also a memory leak and we need this on top of your 
> fix:
>
>
> mm, swapfile: fix swapon frontswap_map memory leak on error 
>
> Free frontswap_map if an error is encountered before enable_swap_info().
>
> Signed-off-by: David Rientjes <rientjes@google.com>
> ---
>  mm/swapfile.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/mm/swapfile.c b/mm/swapfile.c
> --- a/mm/swapfile.c
> +++ b/mm/swapfile.c
> @@ -3053,6 +3053,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
>  	spin_unlock(&swap_lock);
>  	vfree(swap_map);
>  	kvfree(cluster_info);
> +	kvfree(frontswap_map);
>  	if (swap_file) {
>  		if (inode && S_ISREG(inode->i_mode)) {
>  			inode_unlock(inode);

Yes.  There is a memory leak.

Reviewed-by: "Huang, Ying" <ying.huang@intel.com>

Best Regards,
Huang, Ying

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] mm: kvfree the swap cluster info if the swap file is  unsatisfactory "Darrick J. Wong" <darrick.wong@oracle.com> - 2017-09-01 01:40 +0200
  Re: [PATCH] mm: kvfree the swap cluster info if the swap file is unsatisfactory "Huang\, Ying" <ying.huang@intel.com> - 2017-09-01 03:40 +0200
  Re: [PATCH] mm: kvfree the swap cluster info if the swap file is  unsatisfactory David Rientjes <rientjes@google.com> - 2017-09-01 10:40 +0200
    Re: [PATCH] mm: kvfree the swap cluster info if the swap file is unsatisfactory "Huang\, Ying" <ying.huang@intel.com> - 2017-09-04 03:00 +0200

csiph-web