Commit:     2f41dddbbd7193fb5cdae0a24db4d378d56885fd
Parent:     b1d93de3e4633c4cbfd622a3564d8268a116a46a
Author:     Rafael J. Wysocki <[EMAIL PROTECTED]>
AuthorDate: Sat Jun 16 10:16:03 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sat Jun 16 13:16:15 2007 -0700

    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 <[EMAIL PROTECTED]>
    Acked-by: Pavel Machek <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 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 24d7d78..d65305b 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 
        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 
-               if (!data->frozen)
+               if (!data->frozen || data->ready)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to