lkml.org 
[lkml]   [2017]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH -mm] mm, swap: Fix swap space leak in error path of swap_free_entries()
Date
From: Huang Ying <ying.huang@intel.com>

In swapcache_free_entries(), if swap_info_get_cont() return NULL,
something wrong occurs for the swap entry. But we should still
continue to free the following swap entries in the array instead of
skip them to avoid swap space leak. This is just problem in error
path, where system may be in an inconsistent state, but it is still
good to fix it.

Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
Cc: Tim Chen <tim.c.chen@intel.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Shaohua Li <shli@kernel.org>
Cc: Minchan Kim <minchan@kernel.org>
---
mm/swapfile.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 178130880b90..71890061f653 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1079,8 +1079,6 @@ void swapcache_free_entries(swp_entry_t *entries, int n)
p = swap_info_get_cont(entries[i], prev);
if (p)
swap_entry_free(p, entries[i]);
- else
- break;
prev = p;
}
if (p)
--
2.11.0
\
 
 \ /
  Last update: 2017-04-21 14:48    [W:0.037 / U:3.772 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site