From: David Rientjes <rientjes@google.com>
Date: Fri, 8 Sep 2017 23:13:29 +0000 (-0700)
Subject: mm/swapfile.c: fix swapon frontswap_map memory leak on error
X-Git-Tag: v4.12.13~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46791eb9f13e0a092f4814bf23438d79b4259098;p=thirdparty%2Fkernel%2Fstable.git

mm/swapfile.c: fix swapon frontswap_map memory leak on error

commit b6b1fd2a6bedd533aeed83924d7be0e944fded9f upstream.

Free frontswap_map if an error is encountered before enable_swap_info().

Signed-off-by: David Rientjes <rientjes@google.com>
Reviewed-by: "Huang, Ying" <ying.huang@intel.com>
Cc: Darrick J. Wong <darrick.wong@oracle.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 3a21b2b595460..2e09f67bc99bd 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2904,6 +2904,7 @@ bad_swap:
 	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);