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

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

PM / Hibernate: Disable usermode helpers right before freezing tasks 



There is no reason to call usermodehelper_disable() before creating
memory bitmaps in hibernate() and software_resume(), so call it right
before freeze_processes(), in accordance with the other suspend and
hibernation code.  Consequently, call usermodehelper_enable() right
after the thawing of tasks rather than after freeing the memory
bitmaps.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: stable@vger.kernel.org
parent 9b78c1da

kernel/power/hibernate.c

+10 −13
Original line number Diff line number Diff line
@@ -611,19 +611,19 @@ int hibernate(void) 
	if (error)

		goto Exit;



	error = usermodehelper_disable();

	if (error)

		goto Exit;



	/* Allocate memory management structures */

	error = create_basic_memory_bitmaps();

	if (error)

		goto Enable_umh;

		goto Exit;



	printk(KERN_INFO "PM: Syncing filesystems ... ");

	sys_sync();

	printk("done.\n");



	error = usermodehelper_disable();

	if (error)

		goto Exit;



	error = freeze_processes();

	if (error)

		goto Free_bitmaps;
@@ -660,9 +660,8 @@ int hibernate(void) 
	freezer_test_done = false;



 Free_bitmaps:

	free_basic_memory_bitmaps();

 Enable_umh:

	usermodehelper_enable();

	free_basic_memory_bitmaps();

 Exit:

	pm_notifier_call_chain(PM_POST_HIBERNATION);

	pm_restore_console();
@@ -777,15 +776,13 @@ static int software_resume(void) 
	if (error)

		goto close_finish;



	error = usermodehelper_disable();

	error = create_basic_memory_bitmaps();

	if (error)

		goto close_finish;



	error = create_basic_memory_bitmaps();

	if (error) {

		usermodehelper_enable();

	error = usermodehelper_disable();

	if (error)

		goto close_finish;

	}



	pr_debug("PM: Preparing processes for restore.\n");

	error = freeze_processes();
@@ -805,8 +802,8 @@ static int software_resume(void) 
	swsusp_free();

	thaw_processes();

 Done:

	free_basic_memory_bitmaps();

	usermodehelper_enable();

	free_basic_memory_bitmaps();

 Finish:

	pm_notifier_call_chain(PM_POST_RESTORE);

	pm_restore_console();