Return-Path: <linux-kernel-owner+w=401wt.eu-S1754888AbZKBMbl@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754888AbZKBMbl (ORCPT <rfc822;w@1wt.eu>);
	Mon, 2 Nov 2009 07:31:41 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754762AbZKBMbk
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Mon, 2 Nov 2009 07:31:40 -0500
Received: from mk-filter-2-a-1.mail.uk.tiscali.com ([212.74.100.53]:47364 "EHLO
	mk-filter-2-a-1.mail.uk.tiscali.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1754747AbZKBMbk (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 2 Nov 2009 07:31:40 -0500
X-Trace: 282677806/mk-filter-2.mail.uk.tiscali.com/B2C/$b2c-THROTTLED-DYNAMIC/b2c-CUSTOMER-DYNAMIC-IP/79.69.97.16/None/hugh.dickins@tiscali.co.uk
X-SBRS: None
X-RemoteIP: 79.69.97.16
X-IP-MAIL-FROM: hugh.dickins@tiscali.co.uk
X-SMTP-AUTH: 
X-MUA: 
X-IP-BHB: Once
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: AsoEANJf7kpPRWEQ/2dsb2JhbACBUJQWAcR4hDkE
X-IronPort-AV: E=Sophos;i="4.44,666,1249254000"; 
   d="scan'208";a="282677806"
Date: Mon, 2 Nov 2009 12:31:39 +0000 (GMT)
From: Hugh Dickins <hugh.dickins@tiscali.co.uk>
X-X-Sender: hugh@sister.anvils
To: Jiri Slaby <jirislaby@gmail.com>
cc: akpm@linux-foundation.org, linux-mm@kvack.org,
       linux-kernel@vger.kernel.org,
       KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
       Rik van Riel <riel@redhat.com>
Subject: Re: [PATCH 1/1] MM: swapfile, fix crash on double swapon
In-Reply-To: <1257155103-9189-1-git-send-email-jirislaby@gmail.com>
Message-ID: <Pine.LNX.4.64.0911021222010.32400@sister.anvils>
References: <1257155103-9189-1-git-send-email-jirislaby@gmail.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2308
Lines: 66

On Mon, 2 Nov 2009, Jiri Slaby wrote:

> Double swapon on a device causes a crash:
> BUG: unable to handle kernel NULL pointer dereference at (null)

Thanks a lot for finding that: it doesn't just happen with a double
swapon of the same device, it happens with most kinds of error in
the swapon sequence.  I thought I was being nice and tidy moving
that initialization, but actually I was just being careless.

> IP: [<ffffffff810af160>] sys_swapon+0x1f0/0xc60
> PGD 1dc0b067 PUD 1dc09067 PMD 0
> Oops: 0000 [#1] SMP
> last sysfs file:
> CPU 1
> Modules linked in:
> Pid: 562, comm: swapon Tainted: G        W  2.6.32-rc5-mm1_64 #867
> RIP: 0010:[<ffffffff810af160>]  [<ffffffff810af160>] sys_swapon+0x1f0/0xc60
> ...
> 
> It is due to swap_info_struct->first_swap_extent.list not being
> initialized. ->next is NULL in such a situation and
> destroy_swap_extents fails to iterate over the list with the BUG
> above.
> 
> Introduced by swap_info-include-first_swap_extent.patch. Revert the
> INIT_LIST_HEAD move.
> 
> Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
> Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk>
> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
> Cc: Rik van Riel <riel@redhat.com>

Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>

> ---
>  mm/swapfile.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/mm/swapfile.c b/mm/swapfile.c
> index 93e71cf..26ef6a2 100644
> --- a/mm/swapfile.c
> +++ b/mm/swapfile.c
> @@ -1313,7 +1313,6 @@ add_swap_extent(struct swap_info_struct *sis, unsigned long start_page,
>  	if (start_page == 0) {
>  		se = &sis->first_swap_extent;
>  		sis->curr_swap_extent = se;
> -		INIT_LIST_HEAD(&se->list);
>  		se->start_page = 0;
>  		se->nr_pages = nr_pages;
>  		se->start_block = start_block;
> @@ -1769,6 +1768,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
>  		kfree(p);
>  		goto out;
>  	}
> +	INIT_LIST_HEAD(&p->first_swap_extent.list);
>  	if (type >= nr_swapfiles) {
>  		p->type = type;
>  		swap_info[type] = p;
> -- 
> 1.6.4.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/