aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2007-06-16 13:16:03 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-16 16:16:15 -0400
commit2f41dddbbd7193fb5cdae0a24db4d378d56885fd (patch)
treedf51902d5e2e3f8f0429349b9a6abcac201c73cc
parentb1d93de3e4633c4cbfd622a3564d8268a116a46a (diff)
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>
-rw-r--r--kernel/power/user.c4
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,
99 ssize_t res; 99 ssize_t res;
100 100
101 data = filp->private_data; 101 data = filp->private_data;
102 if (!data->ready)
103 return -ENODATA;
102 res = snapshot_read_next(&data->handle, count); 104 res = snapshot_read_next(&data->handle, count);
103 if (res > 0) { 105 if (res > 0) {
104 if (copy_to_user(buf, data_of(data->handle), res)) 106 if (copy_to_user(buf, data_of(data->handle), res))
@@ -245,7 +247,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
245 break; 247 break;
246 248
247 case SNAPSHOT_UNFREEZE: 249 case SNAPSHOT_UNFREEZE:
248 if (!data->frozen) 250 if (!data->frozen || data->ready)
249 break; 251 break;
250 mutex_lock(&pm_mutex); 252 mutex_lock(&pm_mutex);
251 thaw_processes(); 253 thaw_processes();