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

Commit 2b3cfdaa authored by Brian Geffon's avatar Brian Geffon Committed by Greg Kroah-Hartman
Browse files

PM: hibernate: Use __get_safe_page() rather than touching the list 



commit f0c7183008b41e92fa676406d87f18773724b48b upstream.

We found at least one situation where the safe pages list was empty and
get_buffer() would gladly try to use a NULL pointer.

Signed-off-by: default avatarBrian Geffon <bgeffon@google.com>
Fixes: 8357376d ("[PATCH] swsusp: Improve handling of highmem")
Cc: All applicable <stable@vger.kernel.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 612c17a9

kernel/power/snapshot.c

+6 −4
Original line number Diff line number Diff line
@@ -2377,8 +2377,9 @@ static void *get_highmem_page_buffer(struct page *page, 
		pbe->copy_page = tmp;

	} else {

		/* Copy of the page will be stored in normal memory */

		kaddr = safe_pages_list;

		safe_pages_list = safe_pages_list->next;

		kaddr = __get_safe_page(ca->gfp_mask);

		if (!kaddr)

			return ERR_PTR(-ENOMEM);

		pbe->copy_page = virt_to_page(kaddr);

	}

	pbe->next = highmem_pblist;
@@ -2558,8 +2559,9 @@ static void *get_buffer(struct memory_bitmap *bm, struct chain_allocator *ca) 
		return ERR_PTR(-ENOMEM);

	}

	pbe->orig_address = page_address(page);

	pbe->address = safe_pages_list;

	safe_pages_list = safe_pages_list->next;

	pbe->address = __get_safe_page(ca->gfp_mask);

	if (!pbe->address)

		return ERR_PTR(-ENOMEM);

	pbe->next = restore_pblist;

	restore_pblist = pbe;

	return pbe->address;