Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit feba070d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-sleep' 

* pm-sleep:
  PM / hibernate: Avoid overflow in hibernate_preallocate_memory()
parents 15d4cb90 fd432b9f

kernel/power/snapshot.c

+5 −1
Original line number Diff line number Diff line
@@ -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. */