From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:36012 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751465AbdIJMCl (ORCPT ); Sun, 10 Sep 2017 08:02:41 -0400 Subject: Patch "mm: kvfree the swap cluster info if the swap file is unsatisfactory" has been added to the 4.13-stable tree To: darrick.wong@oracle.com, akpm@linux-foundation.org, gregkh@linuxfoundation.org, hughd@google.com, rientjes@google.com, torvalds@linux-foundation.org, ying.huang@intel.com Cc: , From: Date: Sun, 10 Sep 2017 13:37:22 +0200 Message-ID: <15050434424229@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled mm: kvfree the swap cluster info if the swap file is unsatisfactory to the 4.13-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mm-kvfree-the-swap-cluster-info-if-the-swap-file-is-unsatisfactory.patch and it can be found in the queue-4.13 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 8606a1a94da5c4e49c0fb28af62d2e75c6747716 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Fri, 8 Sep 2017 16:13:25 -0700 Subject: mm: kvfree the swap cluster info if the swap file is unsatisfactory From: Darrick J. Wong commit 8606a1a94da5c4e49c0fb28af62d2e75c6747716 upstream. 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. Found by running generic/357 from xfstests. Link: http://lkml.kernel.org/r/20170831233515.GR3775@magnolia Fixes: 54f180d3c181 ("mm, swap: use kvzalloc to allocate some swap data structures") Signed-off-by: Darrick J. Wong Reviewed-by: "Huang, Ying" Acked-by: David Rientjes Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/swapfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3052,7 +3052,7 @@ bad_swap: p->flags = 0; spin_unlock(&swap_lock); vfree(swap_map); - vfree(cluster_info); + kvfree(cluster_info); if (swap_file) { if (inode && S_ISREG(inode->i_mode)) { inode_unlock(inode); Patches currently in stable-queue which might be from darrick.wong@oracle.com are queue-4.13/mm-swapfile.c-fix-swapon-frontswap_map-memory-leak-on-error.patch queue-4.13/mm-kvfree-the-swap-cluster-info-if-the-swap-file-is-unsatisfactory.patch