diff options
author | David Rientjes <rientjes@google.com> | 2017-09-08 16:13:29 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-09-13 14:20:53 -0700 |
commit | 76bf61477a2da0ae5b5a522a3200bdb241e41d66 (patch) | |
tree | 07e03add8ea3cfcb36cdec6d63b6459c03541e74 /mm | |
parent | 36f31cb67a9197bdaa251c822752cab7263ebeed (diff) |
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>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/swapfile.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index c1deb0104b5f..a8952b6563c6 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3053,6 +3053,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); |