From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1039479AbdDUMrw (ORCPT ); Fri, 21 Apr 2017 08:47:52 -0400 Received: from mga11.intel.com ([192.55.52.93]:24144 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1039281AbdDUMrs (ORCPT ); Fri, 21 Apr 2017 08:47:48 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,229,1488873600"; d="scan'208";a="90618581" From: "Huang, Ying" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Tim Chen , Rik van Riel , Hugh Dickins , Shaohua Li , Minchan Kim Subject: [PATCH -mm] mm, swap: Fix swap space leak in error path of swap_free_entries() Date: Fri, 21 Apr 2017 20:47:39 +0800 Message-Id: <20170421124739.24534-1-ying.huang@intel.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Huang Ying 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" Cc: Tim Chen Cc: Rik van Riel Cc: Hugh Dickins Cc: Shaohua Li Cc: Minchan Kim --- 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