swsusp: Fix possible oops in userland interface
Subsystems (2)
PATCH 1/1 swsusp: Fix possible oops in userland interface
From: Stefan Seyfried <[email protected]>
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 <[email protected]>
Signed-off-by Rafael J. Wysocki <[email protected]>
---
user.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
kernel/power/user.c +12 -7
@@ -292,7 +292,7 @@ static int snapshot_ioctl(struct inode *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 *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 *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 :
Quoted 8 lines · Rafael J. Wysocki
From: Stefan Seyfried <[email protected]>
Fix the Oops occuring when
SNAPSHOT_PMOPSorSNAPSHOT_S2RAMioctl is called on a system withoutpm_opsdefined (eg. a non-ACPI kernel on x86 PC).Signed-off-by Stefan Seyfried <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>---
Sorry, I forgot to say: the patch is against 2.6.20 and for the 2.6.20.x stable series.
Greetings,
Rafael
Hi!
Quoted 7 lines
From: Stefan Seyfried <[email protected]>
Fix the Oops occuring when
SNAPSHOT_PMOPSorSNAPSHOT_S2RAMioctl is called on a system withoutpm_opsdefined (eg. a non-ACPI kernel on x86 PC).Signed-off-by Stefan Seyfried <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>
ACK.
Pavel
Quoted 56 lines
---
user.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)kernel/power/user.c +12
-7@@ -292,7 +292,7 @@ static int snapshot_ioctl(struct inode *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 *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 *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 :
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html