Merge branch 'pm-sleep'

* pm-sleep: PM / hibernate: Avoid overflow in hibernate_preallocate_memory()
mariux64 · Nov 7, 2013 · feba070 · feba070
2 parents 15d4cb9 + fd432b9
commit feba070
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
@@ -1402,7 +1402,11 @@ int hibernate_preallocate_memory(void)
 	 * highmem and non-highmem zones separately.
 	 */
 	pages_highmem = preallocate_image_highmem(highmem / 2);
-	alloc = (count - max_size) - pages_highmem;
+	alloc = count - max_size;
+	if (alloc > pages_highmem)
+		alloc -= pages_highmem;
+	else
+		alloc = 0;
 	pages = preallocate_image_memory(alloc, avail_normal);
 	if (pages < alloc) {
 		/* We have exhausted non-highmem pages, try highmem. */