From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Linux-pm mailing list <linux-pm@lists.osdl.org>
Cc: Linux Kernel list <linux-kernel@vger.kernel.org>,
Pavel Machek <pavel@ucw.cz>
Subject: [PATCH] Don't explode on swsusp failure to find swap
Date: Tue, 31 May 2005 17:13:05 +1000 [thread overview]
Message-ID: <1117523585.5826.18.camel@gaston> (raw)
[-- Attachment #1: Type: text/plain, Size: 879 bytes --]
Hi !
If we specify a swap device for swsusp using resume= kernel argument and
that device doesn't exist in the swap list, we end up calling
swsusp_free() before we have allocated pagedir_save. That causes us to
explode when trying to free it.
Pavel, does that look right ?
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Index: linux-work/kernel/power/swsusp.c
===================================================================
--- linux-work.orig/kernel/power/swsusp.c 2005-05-31 16:29:22.000000000 +1000
+++ linux-work/kernel/power/swsusp.c 2005-05-31 16:57:30.000000000 +1000
@@ -730,10 +730,13 @@
void swsusp_free(void)
{
+ if (pagedir_save == NULL)
+ return;
BUG_ON(PageNosave(virt_to_page(pagedir_save)));
BUG_ON(PageNosaveFree(virt_to_page(pagedir_save)));
free_image_pages();
free_pagedir(pagedir_save);
+ pagedir_save = NULL;
}
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Linux-pm mailing list <linux-pm@lists.osdl.org>
Cc: Pavel Machek <pavel@ucw.cz>,
Linux Kernel list <linux-kernel@vger.kernel.org>
Subject: [PATCH] Don't explode on swsusp failure to find swap
Date: Tue, 31 May 2005 17:13:05 +1000 [thread overview]
Message-ID: <1117523585.5826.18.camel@gaston> (raw)
Hi !
If we specify a swap device for swsusp using resume= kernel argument and
that device doesn't exist in the swap list, we end up calling
swsusp_free() before we have allocated pagedir_save. That causes us to
explode when trying to free it.
Pavel, does that look right ?
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Index: linux-work/kernel/power/swsusp.c
===================================================================
--- linux-work.orig/kernel/power/swsusp.c 2005-05-31 16:29:22.000000000 +1000
+++ linux-work/kernel/power/swsusp.c 2005-05-31 16:57:30.000000000 +1000
@@ -730,10 +730,13 @@
void swsusp_free(void)
{
+ if (pagedir_save == NULL)
+ return;
BUG_ON(PageNosave(virt_to_page(pagedir_save)));
BUG_ON(PageNosaveFree(virt_to_page(pagedir_save)));
free_image_pages();
free_pagedir(pagedir_save);
+ pagedir_save = NULL;
}
next reply other threads:[~2005-05-31 7:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-31 7:13 Benjamin Herrenschmidt [this message]
2005-05-31 7:13 ` [PATCH] Don't explode on swsusp failure to find swap Benjamin Herrenschmidt
2005-05-31 10:36 ` Pavel Machek
2005-05-31 10:36 ` Pavel Machek
2005-05-31 14:45 ` Benjamin Herrenschmidt
2005-05-31 14:45 ` Benjamin Herrenschmidt
2005-05-31 23:50 ` Benjamin Herrenschmidt
2005-05-31 23:50 ` Benjamin Herrenschmidt
2005-06-01 6:52 ` Shaohua Li
2005-06-01 6:52 ` [linux-pm] " Shaohua Li
2005-06-01 9:29 ` Pavel Machek
2005-06-01 9:29 ` [linux-pm] " Pavel Machek
2005-06-01 9:27 ` Pavel Machek
2005-06-01 9:27 ` Pavel Machek
2005-06-01 19:20 ` [linux-pm] " Rafael J. Wysocki
2005-06-01 20:42 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1117523585.5826.18.camel@gaston \
--to=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@lists.osdl.org \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.