This is a note to let you know that I've just added the patch titled
PM / Hibernate: Fix free_unnecessary_pages()
to the 2.6.39-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
pm-hibernate-fix-free_unnecessary_pages.patch
and it can be found in the queue-2.6.39 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 4d4cf23cdde2f8f9324f5684a7f349e182039529 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <[email protected]>
Date: Wed, 6 Jul 2011 20:15:23 +0200
Subject: PM / Hibernate: Fix free_unnecessary_pages()
From: "Rafael J. Wysocki" <[email protected]>
commit 4d4cf23cdde2f8f9324f5684a7f349e182039529 upstream.
There is a bug in free_unnecessary_pages() that causes it to
attempt to free too many pages in some cases, which triggers the
BUG_ON() in memory_bm_clear_bit() for copy_bm. Namely, if
count_data_pages() is initially greater than alloc_normal, we get
to_free_normal equal to 0 and "save" greater from 0. In that case,
if the sum of "save" and count_highmem_pages() is greater than
alloc_highmem, we subtract a positive number from to_free_normal.
Hence, since to_free_normal was 0 before the subtraction and is
an unsigned int, the result is converted to a huge positive number
that is used as the number of pages to free.
Fix this bug by checking if to_free_normal is actually greater
than or equal to the number we're going to subtract from it.
Signed-off-by: Rafael J. Wysocki <[email protected]>
Reported-and-tested-by: Matthew Garrett <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
kernel/power/snapshot.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -1199,7 +1199,11 @@ static void free_unnecessary_pages(void)
to_free_highmem = alloc_highmem - save;
} else {
to_free_highmem = 0;
- to_free_normal -= save - alloc_highmem;
+ save -= alloc_highmem;
+ if (to_free_normal > save)
+ to_free_normal -= save;
+ else
+ to_free_normal = 0;
}
memory_bm_position_reset(©_bm);
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.39/x86-suspend-restore-misc_enable-msr-in-realmode-wakeup.patch
queue-2.6.39/pm-free-memory-bitmaps-if-opening-dev-snapshot-fails.patch
queue-2.6.39/pm-hibernate-fix-free_unnecessary_pages.patch
queue-2.6.39/pm-fix-async-resume-following-suspend-failure.patch
queue-2.6.39/pci-pm-block-races-between-runtime-pm-and-system-sleep.patch
queue-2.6.39/pm-rename-dev_pm_info.in_suspend-to-is_prepared.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
