NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Brian Geffon <bgeffon@google.com>
Fixes: 8357376d3d ("[PATCH] swsusp: Improve handling of highmem")
Cc: All applicable <stable@vger.kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Brian Geffon 2023-09-21 13:00:45 -04:00 • committed by Greg Kroah-Hartman
parent 2c9222b7dc
commit 567c6f6495
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
kernel/power/snapshot.c
View file

@ -2418,8 +2418,9 @@ static void *get_highmem_page_buffer(struct page *page,
pbe->copy_page = tmp; pbe->copy_page = tmp;
} else { } else {
/* Copy of the page will be stored in normal memory */ /* Copy of the page will be stored in normal memory */
kaddr = safe_pages_list; kaddr = __get_safe_page(ca->gfp_mask);
safe_pages_list = safe_pages_list->next; if (!kaddr)
return ERR_PTR(-ENOMEM);
pbe->copy_page = virt_to_page(kaddr); pbe->copy_page = virt_to_page(kaddr);
} }
pbe->next = highmem_pblist; pbe->next = highmem_pblist;
@ -2599,8 +2600,9 @@ static void *get_buffer(struct memory_bitmap *bm, struct chain_allocator *ca)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
pbe->orig_address = page_address(page); pbe->orig_address = page_address(page);
pbe->address = safe_pages_list; pbe->address = __get_safe_page(ca->gfp_mask);
safe_pages_list = safe_pages_list->next; if (!pbe->address)
return ERR_PTR(-ENOMEM);
pbe->next = restore_pblist; pbe->next = restore_pblist;
restore_pblist = pbe; restore_pblist = pbe;
return pbe->address; return pbe->address;