lkml.org 
[lkml]   [2012]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] PM/Hibernate: Enable usermodehelpers in hibernate() error path
Date
On Thursday, February 16, 2012, Srivatsa S. Bhat wrote:
> If create_basic_memory_bitmaps() fails, usermodehelpers are not re-enabled
> before returning. Fix this. And while at it, reword the goto labels so that
> they look more meaningful.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>

Applied, thanks for catching this!

Rafael


> ---
>
> kernel/power/hibernate.c | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> index 72baaf0..0a186cf 100644
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@ -618,7 +618,7 @@ int hibernate(void)
> /* Allocate memory management structures */
> error = create_basic_memory_bitmaps();
> if (error)
> - goto Exit;
> + goto Enable_umh;
>
> printk(KERN_INFO "PM: Syncing filesystems ... ");
> sys_sync();
> @@ -626,7 +626,7 @@ int hibernate(void)
>
> error = freeze_processes();
> if (error)
> - goto Finish;
> + goto Free_bitmaps;
>
> error = hibernation_snapshot(hibernation_mode == HIBERNATION_PLATFORM);
> if (error || freezer_test_done)
> @@ -659,8 +659,9 @@ int hibernate(void)
> /* Don't bother checking whether freezer_test_done is true */
> freezer_test_done = false;
>
> - Finish:
> + Free_bitmaps:
> free_basic_memory_bitmaps();
> + Enable_umh:
> usermodehelper_enable();
> Exit:
> pm_notifier_call_chain(PM_POST_HIBERNATION);
>
>
>



\
 
 \ /
  Last update: 2012-02-17 23:51    [W:0.067 / U:1.592 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site