The patch titled
swsusp: fix sysfs interface
has been added to the -mm tree. Its filename is
swsusp-fix-sysfs-interface.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 sysfs interface
From: Rafael J. Wysocki <rjw@xxxxxxx>
The sysfs files /sys/power/disk and /sys/power/state do not work as
documented, since they allow the user to write only a few initial
characters of the input string to trigger the option (eg. 'echo pl >
/sys/power/disk' activates the platform mode of hibernation). Fix it.
Special thanks to Peter Moulder <Peter.Moulder@xxxxxxxxxxxxxxxxxxxxxx> for
pointing out the problem.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Acked-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/power/disk.c | 3 ++-
kernel/power/main.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff -puN kernel/power/disk.c~swsusp-fix-sysfs-interface kernel/power/disk.c
--- a/kernel/power/disk.c~swsusp-fix-sysfs-interface
+++ a/kernel/power/disk.c
@@ -416,7 +416,8 @@ static ssize_t disk_store(struct kset *k
mutex_lock(&pm_mutex);
for (i = HIBERNATION_FIRST; i <= HIBERNATION_MAX; i++) {
- if (!strncmp(buf, hibernation_modes[i], len)) {
+ if (len == strlen(hibernation_modes[i])
+ && !strncmp(buf, hibernation_modes[i], len)) {
mode = i;
break;
}
diff -puN kernel/power/main.c~swsusp-fix-sysfs-interface kernel/power/main.c
--- a/kernel/power/main.c~swsusp-fix-sysfs-interface
+++ a/kernel/power/main.c
@@ -289,13 +289,13 @@ static ssize_t state_store(struct kset *
len = p ? p - buf : n;
/* First, check if we are requested to hibernate */
- if (!strncmp(buf, "disk", len)) {
+ if (len == 4 && !strncmp(buf, "disk", len)) {
error = hibernate();
return error ? error : n;
}
for (s = &pm_states[state]; state < PM_SUSPEND_MAX; s++, state++) {
- if (*s && !strncmp(buf, *s, len))
+ if (*s && len == strlen(*s) && !strncmp(buf, *s, len))
break;
}
if (state < PM_SUSPEND_MAX && *s)
_
Patches currently in -mm which might be from rjw@xxxxxxx are
at91-fix-enable-disable_irq_wake-symmetry-in-pcmcia-driver.patch
make-freezeable-workqueues-singlethread.patch
swsusp-fix-sysfs-interface.patch
freezer-close-potential-race-between-refrigerator-and-thaw_tasks.patch
freezer-fix-vfork-problem.patch
freezer-take-kernel_execve-into-consideration.patch
freezer-fix-kthread_create-vs-freezer-theoretical-race.patch
freezer-fix-pf_nofreeze-vs-freezeable-race.patch
freezer-move-frozen_process-to-kernel-power-processc.patch
add-common-orderly_poweroff.patch
add-suspend-related-notifications-for-cpu-hotplug-statistics.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
