diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-06-16 10:16:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-16 13:16:15 -0700 |
| commit | 2f41dddbbd7193fb5cdae0a24db4d378d56885fd (patch) | |
| tree | df51902d5e2e3f8f0429349b9a6abcac201c73cc /kernel/power/user.c | |
| parent | b1d93de3e4633c4cbfd622a3564d8268a116a46a (diff) | |
| download | kernel-common-2f41dddbbd7193fb5cdae0a24db4d378d56885fd.tar.gz kernel-common-2f41dddbbd7193fb5cdae0a24db4d378d56885fd.tar.bz2 kernel-common-2f41dddbbd7193fb5cdae0a24db4d378d56885fd.zip | |
swsusp: Fix userland interface
Fix oops caused by 'cat /dev/snapshot', reported by Arkadiusz Miskiewicz,
and make it impossible to thaw tasks with the help of the swsusp userland
interface while there is a snapshot image ready to save.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/power/user.c')
| -rw-r--r-- | kernel/power/user.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/power/user.c b/kernel/power/user.c index 24d7d78e6f42..d65305b515b1 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c @@ -99,6 +99,8 @@ static ssize_t snapshot_read(struct file *filp, char __user *buf, ssize_t res; data = filp->private_data; + if (!data->ready) + return -ENODATA; res = snapshot_read_next(&data->handle, count); if (res > 0) { if (copy_to_user(buf, data_of(data->handle), res)) @@ -245,7 +247,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp, break; case SNAPSHOT_UNFREEZE: - if (!data->frozen) + if (!data->frozen || data->ready) break; mutex_lock(&pm_mutex); thaw_processes(); |