Skip to content

Commit

Permalink
[PATCH] swsusp: prevent possible memory leak
Browse files Browse the repository at this point in the history
Prevent swsusp from leaking some memory in case of an error in
read_pagedir().  It also prevents the BUG_ON() from triggering if there's
an error while reading swap.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Rafael J. Wysocki authored and Linus Torvalds committed Sep 28, 2005
1 parent 254b547 commit f2d6137
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions kernel/power/swsusp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1437,9 +1437,9 @@ static int read_pagedir(struct pbe *pblist)
}

if (error)
free_page((unsigned long)pblist);

BUG_ON(i != swsusp_info.pagedir_pages);
free_pagedir(pblist);
else
BUG_ON(i != swsusp_info.pagedir_pages);

return error;
}
Expand Down

0 comments on commit f2d6137

Please sign in to comment.