From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1432125AbdDYVhZ (ORCPT <rfc822;w@1wt.eu>);
        Tue, 25 Apr 2017 17:37:25 -0400
Received: from mail.linuxfoundation.org ([140.211.169.12]:54904 "EHLO
        mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1432081AbdDYVhV (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 25 Apr 2017 17:37:21 -0400
Date: Tue, 25 Apr 2017 14:37:18 -0700
From: Andrew Morton <akpm@linux-foundation.org>
To: "Huang, Ying" <ying.huang@intel.com>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        Tim Chen <tim.c.chen@intel.com>, Rik van Riel <riel@redhat.com>,
        Hugh Dickins <hughd@google.com>, Shaohua Li <shli@kernel.org>,
        Minchan Kim <minchan@kernel.org>
Subject: Re: [PATCH -mm] mm, swap: Fix swap space leak in error path of
 swap_free_entries()
Message-Id: <20170425143718.d05d4f5020b266dfdd61ed9c@linux-foundation.org>
In-Reply-To: <20170421124739.24534-1-ying.huang@intel.com>
References: <20170421124739.24534-1-ying.huang@intel.com>
X-Mailer: Sylpheed 3.4.1 (GTK+ 2.24.23; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, 21 Apr 2017 20:47:39 +0800 "Huang, Ying" <ying.huang@intel.com> wrote:

> 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.
> 
> ...
>
> --- 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;

So now prev==NULL.  Will this code get the locking correct in
swap_info_get_cont()?  I think so, but please double-check.

>  	}
>  	if (p)