The patch titled
swsusp: fix possible oops in userland interface
has been added to the -mm tree. Its filename is
swsusp-change-pm_ops-handling-by-userland-interface-fix.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: swsusp: fix possible oops in userland interface
From: "Rafael J. Wysocki" <rjw@xxxxxxx>
The SNAPSHOT_PMOPS and SNAPSHOT_S2RAM ioctls can Oops if they are called
from a kernel that doesn't set pm_ops (eg. non-ACPI kernel on a PC). Fix
it.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Acked-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/power/user.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff -puN kernel/power/user.c~swsusp-change-pm_ops-handling-by-userland-interface-fix kernel/power/user.c
--- a/kernel/power/user.c~swsusp-change-pm_ops-handling-by-userland-interface-fix
+++ a/kernel/power/user.c
@@ -341,6 +341,11 @@ static int snapshot_ioctl(struct inode *
break;
case SNAPSHOT_S2RAM:
+ if (!pm_ops) {
+ error = -ENOSYS;
+ break;
+ }
+
if (!data->frozen) {
error = -EPERM;
break;
@@ -383,8 +388,12 @@ static int snapshot_ioctl(struct inode *
switch (arg) {
case PMOPS_PREPARE:
- data->platform_suspend = 1;
- error = 0;
+ if (pm_ops && pm_ops->enter) {
+ data->platform_suspend = 1;
+ error = 0;
+ } else {
+ error = -ENOSYS;
+ }
break;
case PMOPS_ENTER:
_
Patches currently in -mm which might be from rjw@xxxxxxx are
pm-change-code-ordering-in-mainc.patch
swsusp-change-code-ordering-in-diskc.patch
swsusp-change-code-order-in-diskc-fix.patch
swsusp-change-code-ordering-in-userc.patch
swsusp-change-code-ordering-in-userc-sanity.patch
swsusp-change-pm_ops-handling-by-userland-interface.patch
swsusp-change-pm_ops-handling-by-userland-interface-fix.patch
shrink_slab-handle-bad-shrinkers.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
