Skip to content

Commit

Permalink
PM: disable usermode helper before hibernation and suspend
Browse files Browse the repository at this point in the history
Use a hibernation and suspend notifier to disable the user mode helper before
a hibernation/suspend and enable it after the operation.

[[email protected]: build fix]
Signed-off-by: Rafael J. Wysocki <[email protected]>
Acked-by: Pavel Machek <[email protected]>
Acked-by: Nigel Cunningham <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
rjwysocki authored and Linus Torvalds committed Jul 19, 2007
1 parent b10d911 commit 8cdd493
Showing 1 changed file with 30 additions and 1 deletion.
31 changes: 30 additions & 1 deletion kernel/kmod.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,22 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/resource.h>
#include <linux/notifier.h>
#include <linux/suspend.h>
#include <asm/uaccess.h>

extern int max_threads;

static struct workqueue_struct *khelper_wq;

/*
* If set, both call_usermodehelper_keys() and call_usermodehelper_pipe() exit
* immediately returning -EBUSY. Used for preventing user land processes from
* being created after the user land has been frozen during a system-wide
* hibernation or suspend operation.
*/
static int usermodehelper_disabled;

#ifdef CONFIG_KMOD

/*
Expand Down Expand Up @@ -265,6 +275,24 @@ static void __call_usermodehelper(struct work_struct *work)
}
}

static int usermodehelper_pm_callback(struct notifier_block *nfb,
unsigned long action,
void *ignored)
{
switch (action) {
case PM_HIBERNATION_PREPARE:
case PM_SUSPEND_PREPARE:
usermodehelper_disabled = 1;
return NOTIFY_OK;
case PM_POST_HIBERNATION:
case PM_POST_SUSPEND:
usermodehelper_disabled = 0;
return NOTIFY_OK;
}

return NOTIFY_DONE;
}

/**
* call_usermodehelper_setup - prepare to call a usermode helper
* @path - path to usermode executable
Expand Down Expand Up @@ -374,7 +402,7 @@ int call_usermodehelper_exec(struct subprocess_info *sub_info,
goto out;
}

if (!khelper_wq) {
if (!khelper_wq || usermodehelper_disabled) {
retval = -EBUSY;
goto out;
}
Expand Down Expand Up @@ -431,4 +459,5 @@ void __init usermodehelper_init(void)
{
khelper_wq = create_singlethread_workqueue("khelper");
BUG_ON(!khelper_wq);
pm_notifier(usermodehelper_pm_callback, 0);
}

0 comments on commit 8cdd493

Please sign in to comment.