TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swsusp: Fix possible oops in userland interface

Browse Source 
Fix the Oops occuring when SNAPSHOT_PMOPS or SNAPSHOT_S2RAM ioctl is called on
a system without pm_ops defined (eg. a non-ACPI kernel on x86 PC).

Signed-off-by: Stefan Seyfried <seife@suse.de>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Stefan Seyfried
2007-02-24 23:06:43 +01:00
committed by Greg Kroah-Hartman
parent 4b5e65dedf
commit b5f7f3ef64
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/power/user.c
+12 -7
View File
@@ -292,7 +292,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
break;
}
if (pm_ops->prepare) {
if (pm_ops && pm_ops->prepare) {
error = pm_ops->prepare(PM_SUSPEND_MEM);
if (error)
goto OutS3;
@@ -311,7 +311,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
device_resume();
}
resume_console();
if (pm_ops->finish)
if (pm_ops && pm_ops->finish)
pm_ops->finish(PM_SUSPEND_MEM);
OutS3:
@@ -322,20 +322,25 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
switch (arg) {
case PMOPS_PREPARE:
if (pm_ops->prepare) {
if (pm_ops && pm_ops->prepare)
error = pm_ops->prepare(PM_SUSPEND_DISK);
}
else
error = -ENOSYS;
break;
case PMOPS_ENTER:
kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
error = pm_ops->enter(PM_SUSPEND_DISK);
if (pm_ops && pm_ops->enter)
error = pm_ops->enter(PM_SUSPEND_DISK);
else
error = -ENOSYS;
break;
case PMOPS_FINISH:
if (pm_ops && pm_ops->finish) {
if (pm_ops && pm_ops->finish)
pm_ops->finish(PM_SUSPEND_DISK);
}
else
error = -ENOSYS;
break;
default: