[PATCH] swsusp: add check for suspension of X-controlled devices

It is unsafe to suspend devices if the hardware is controlled by X.  Add an
extra check to prevent this from happening.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index 8660779fb288b3a29b1401b110ec2bd3289dfc15..bdb60663f2eff5e9243921d8c0e144b8f1c7cd17 100644 (file)
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -8,6 +8,7 @@
  *
  */
 
+#include <linux/vt_kern.h>
 #include <linux/device.h>
 #include "../base.h"
 #include "power.h"
@@ -62,7 +63,6 @@ int suspend_device(struct device * dev, pm_message_t state)
        return error;
 }
 
-
 /**
  *     device_suspend - Save state and stop all devices in system.
  *     @state:         Power state to put each device in.
@@ -82,6 +82,9 @@ int device_suspend(pm_message_t state)
 {
        int error = 0;
 
+       if (!is_console_suspend_safe())
+               return -EINVAL;
+
        down(&dpm_sem);
        down(&dpm_list_sem);
        while (!list_empty(&dpm_active) && error == 0) {

diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 0900d1dbee59916e28bd60b7cb650cea7d9a3b41..86b31b87eb850824a56dce2a26fe111d8f74da90 100644 (file)
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -3234,6 +3234,14 @@ void vcs_scr_writew(struct vc_data *vc, u16 val, u16 *org)
        }
 }
 
+int is_console_suspend_safe(void)
+{
+       /* It is unsafe to suspend devices while X has control of the
+        * hardware. Make sure we are running on a kernel-controlled console.
+        */
+       return vc_cons[fg_console].d->vc_mode == KD_TEXT;
+}
+
 /*
  *     Visible symbols for modules
  */

diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index fab5aed8ca315cc71217dae905e2dda1ac598201..530ae3f4248ccb6afb3dfe84cee7c1264e32ca38 100644 (file)
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -73,6 +73,11 @@ int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc);
 int vt_waitactive(int vt);
 void change_console(struct vc_data *new_vc);
 void reset_vc(struct vc_data *vc);
+#ifdef CONFIG_VT
+int is_console_suspend_safe(void);
+#else
+static inline int is_console_suspend_safe(void) { return 1; }
+#endif
 
 /*
  * vc_screen.c shares this temporary buffer with the console write code so that