From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail144.messagelabs.com (mail144.messagelabs.com [216.82.254.51]) by kanga.kvack.org (Postfix) with ESMTP id CB30C6B004D for ; Mon, 2 Nov 2009 04:45:09 -0500 (EST) From: Jiri Slaby Subject: [PATCH 1/1] MM: swapfile, fix crash on double swapon Date: Mon, 2 Nov 2009 10:45:03 +0100 Message-Id: <1257155103-9189-1-git-send-email-jirislaby@gmail.com> Sender: owner-linux-mm@kvack.org To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Jiri Slaby , Hugh Dickins , KAMEZAWA Hiroyuki , Rik van Riel List-ID: Double swapon on a device causes a crash: BUG: unable to handle kernel NULL pointer dereference at (null) IP: [] 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:[] [] 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 Cc: Hugh Dickins Cc: KAMEZAWA Hiroyuki Cc: Rik van Riel --- 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, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org