* [merged] mm-swapfile-fix-swapon-frontswap_map-memory-leak-on-error.patch removed from -mm tree
@ 2017-09-11 19:40 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2017-09-11 19:40 UTC (permalink / raw)
To: darrick.wong, hughd, mm-commits, rientjes, stable, ying.huang
The patch titled
Subject: mm/swapfile.c: fix swapon frontswap_map memory leak on error
has been removed from the -mm tree. Its filename was
mm-swapfile-fix-swapon-frontswap_map-memory-leak-on-error.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: David Rientjes <rientjes@google.com>
Subject: mm/swapfile.c: 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>
Reviewed-by: "Huang, Ying" <ying.huang@intel.com>
Cc: Darrick J. Wong <darrick.wong@oracle.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: <stable@vger.kernel.org> [4.12+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/swapfile.c | 1 +
1 file changed, 1 insertion(+)
diff -puN mm/swapfile.c~mm-swapfile-fix-swapon-frontswap_map-memory-leak-on-error mm/swapfile.c
--- a/mm/swapfile.c~mm-swapfile-fix-swapon-frontswap_map-memory-leak-on-error
+++ a/mm/swapfile.c
@@ -3291,6 +3291,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);
_
Patches currently in -mm which might be from rientjes@google.com are
mm-compaction-kcompactd-should-not-ignore-pageblock-skip.patch
mm-compaction-persistently-skip-hugetlbfs-pageblocks.patch
mm-compaction-persistently-skip-hugetlbfs-pageblocks-fix.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-09-11 19:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-11 19:40 [merged] mm-swapfile-fix-swapon-frontswap_map-memory-leak-on-error.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.