Commit af5bb145 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds

[PATCH] Fix memory leak in swsusp

This fixes 2 memory leaks in swsusp: during relocating pagedir, eaten pages
were not properly freed in error path and even regular freeing path was
freeing one page too little.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 48813c1e
...@@ -503,6 +503,9 @@ static int count_and_copy_zone(struct zone *zone, struct pbe **pagedir_p) ...@@ -503,6 +503,9 @@ static int count_and_copy_zone(struct zone *zone, struct pbe **pagedir_p)
if (!pbe) if (!pbe)
continue; continue;
pbe->orig_address = (long) page_address(page); pbe->orig_address = (long) page_address(page);
/* Copy page is dangerous: it likes to mess with
preempt count on specific cpus. Wrong preempt count is then copied,
oops. */
copy_page((void *)pbe->address, (void *)pbe->orig_address); copy_page((void *)pbe->address, (void *)pbe->orig_address);
pbe++; pbe++;
} }
...@@ -923,8 +926,9 @@ static int relocate_pagedir(void) ...@@ -923,8 +926,9 @@ static int relocate_pagedir(void)
suspend_pagedir_t *new_pagedir, *old_pagedir = pagedir_nosave; suspend_pagedir_t *new_pagedir, *old_pagedir = pagedir_nosave;
void **eaten_memory = NULL; void **eaten_memory = NULL;
void **c = eaten_memory, *m, *f; void **c = eaten_memory, *m, *f;
int ret = 0;
printk("Relocating pagedir"); printk("Relocating pagedir ");
if(!does_collide_order(old_pagedir, (unsigned long)old_pagedir, pagedir_order)) { if(!does_collide_order(old_pagedir, (unsigned long)old_pagedir, pagedir_order)) {
printk("not necessary\n"); printk("not necessary\n");
...@@ -941,22 +945,23 @@ static int relocate_pagedir(void) ...@@ -941,22 +945,23 @@ static int relocate_pagedir(void)
c = eaten_memory; c = eaten_memory;
} }
if (!m) if (!m) {
return -ENOMEM; printk("out of memory\n");
ret = -ENOMEM;
pagedir_nosave = new_pagedir = m; } else {
copy_pagedir(new_pagedir, old_pagedir); pagedir_nosave = new_pagedir = m;
copy_pagedir(new_pagedir, old_pagedir);
}
c = eaten_memory; c = eaten_memory;
while(c) { while (c) {
printk(":"); printk(":");
f = *c; f = c;
c = *c; c = *c;
if (f) free_pages((unsigned long)f, pagedir_order);
free_pages((unsigned long)f, pagedir_order);
} }
printk("|\n"); printk("|\n");
return 0; return ret;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment