Merge branch 'pm-sleep'

* pm-sleep: PM / Hibernate: Do not crash kernel in free_basic_memory_bitmaps()

Merge branch 'pm-sleep'
* pm-sleep: PM / Hibernate: Do not crash kernel in free_basic_memory_bitmaps()
Rafael J. Wysocki
2 parents 9bad584548 6a0c7cd330
Showing 2 changed files Side-by-side Diff
kernel/power/snapshot.c
kernel/power/user.c
@@ -792,7 +792,8 @@
 {
 	struct memory_bitmap *bm1, *bm2;
  
-	BUG_ON(!(forbidden_pages_map && free_pages_map));
+	if (WARN_ON(!(forbidden_pages_map && free_pages_map)))
+		return;
  
 	bm1 = forbidden_pages_map;
 	bm2 = free_pages_map;
@@ -70,6 +70,7 @@
 		data->swap = swsusp_resume_device ?
 			swap_type_of(swsusp_resume_device, 0, NULL) : -1;
 		data->mode = O_RDONLY;
+		data->free_bitmaps = false;
 		error = pm_notifier_call_chain(PM_HIBERNATION_PREPARE);
 		if (error)
 			pm_notifier_call_chain(PM_POST_HIBERNATION);
...	...	@@ -792,7 +792,8 @@
792	792	{
793	793	struct memory_bitmap bm1, bm2;
794	794
795		- BUG_ON(!(forbidden_pages_map && free_pages_map));
	795	+ if (WARN_ON(!(forbidden_pages_map && free_pages_map)))
	796	+ return;
796	797
797	798	bm1 = forbidden_pages_map;
798	799	bm2 = free_pages_map;
...	...	@@ -70,6 +70,7 @@
70	70	data->swap = swsusp_resume_device ?
71	71	swap_type_of(swsusp_resume_device, 0, NULL) : -1;
72	72	data->mode = O_RDONLY;
	73	+ data->free_bitmaps = false;
73	74	error = pm_notifier_call_chain(PM_HIBERNATION_PREPARE);
74	75	if (error)
75	76	pm_notifier_call_chain(PM_POST_HIBERNATION);