---

yaml --- r: 9395 b: refs/heads/master c: 0f7347c h: refs/heads/master i: 9393: 5029ea6 9391: 278fdbe v: v3
git-mirror · Sep 28, 2005 · f45fb61 · f45fb61
1 parent 8f512a7
commit f45fb61
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f65a4d10c8a4eb9f919cf416e5dcd720b7d20f50
+refs/heads/master: 0f7347c20c410c300be0db4c132945fd02e54110
diff --git a/trunk/kernel/power/power.h b/trunk/kernel/power/power.h
@@ -9,6 +9,9 @@
 #define SUSPEND_CONSOLE	(MAX_NR_CONSOLES-1)
 #endif
 
+#define MAX_PBES	((PAGE_SIZE - sizeof(struct new_utsname) \
+			- 4 - 3*sizeof(unsigned long) - sizeof(int) \
+			- sizeof(void *)) / sizeof(swp_entry_t))
 
 struct swsusp_info {
 	struct new_utsname	uts;
@@ -18,7 +21,7 @@ struct swsusp_info {
 	unsigned long		image_pages;
 	unsigned long		pagedir_pages;
 	suspend_pagedir_t	* suspend_pagedir;
-	swp_entry_t		pagedir[768];
+	swp_entry_t		pagedir[MAX_PBES];
 } __attribute__((aligned(PAGE_SIZE)));
 
 

diff --git a/trunk/kernel/power/swsusp.c b/trunk/kernel/power/swsusp.c
@@ -931,6 +931,10 @@ static int swsusp_alloc(void)
 	if (!enough_swap())
 		return -ENOSPC;
 
+	if (MAX_PBES < nr_copy_pages / PBES_PER_PAGE +
+	    !!(nr_copy_pages % PBES_PER_PAGE))
+		return -ENOSPC;
+
 	if (!(pagedir_save = alloc_pagedir(nr_copy_pages))) {
 		printk(KERN_ERR "suspend: Allocating pagedir failed.\n");
 		return -ENOMEM;