1 files changed, 44 insertions, 30 deletions

diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index e74ed9cc6371..1719554fe194 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -439,6 +439,9 @@ static ssize_t uinput_write(struct file *file, const char __user *buffer, size_t
         struct uinput_device *udev = file->private_data;
         int retval;
 
+        if (count == 0)
+                return 0;
+
         retval = mutex_lock_interruptible(&udev->mutex);
         if (retval)
                 return retval;
@@ -470,48 +473,59 @@ static bool uinput_fetch_next_event(struct uinput_device *udev,
         return have_event;
 }
 
-static ssize_t uinput_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
+static ssize_t uinput_events_to_user(struct uinput_device *udev,
+                                     char __user *buffer, size_t count)
 {
-        struct uinput_device *udev = file->private_data;
         struct input_event event;
-        int retval = 0;
+        size_t read = 0;
+        int error = 0;
 
-        if (count != 0 && count < input_event_size())
-                return -EINVAL;
+        while (read + input_event_size() <= count &&
+               uinput_fetch_next_event(udev, &event)) {
 
-        if (udev->state != UIST_CREATED)
-                return -ENODEV;
+                if (input_event_to_user(buffer + read, &event)) {
+                        error = -EFAULT;
+                        break;
+                }
 
-        if (udev->head == udev->tail && (file->f_flags & O_NONBLOCK))
-                return -EAGAIN;
+                read += input_event_size();
+        }
 
-        retval = wait_event_interruptible(udev->waitq,
-                        udev->head != udev->tail || udev->state != UIST_CREATED);
-        if (retval)
-                return retval;
+        return read ?: error;
+}
 
-        retval = mutex_lock_interruptible(&udev->mutex);
-        if (retval)
-                return retval;
+static ssize_t uinput_read(struct file *file, char __user *buffer,
+                           size_t count, loff_t *ppos)
+{
+        struct uinput_device *udev = file->private_data;
+        ssize_t retval;
 
-        if (udev->state != UIST_CREATED) {
-                retval = -ENODEV;
-                goto out;
-        }
+        if (count != 0 && count < input_event_size())
+                return -EINVAL;
 
-        while (retval + input_event_size() <= count &&
-               uinput_fetch_next_event(udev, &event)) {
+        do {
+                retval = mutex_lock_interruptible(&udev->mutex);
+                if (retval)
+                        return retval;
 
-                if (input_event_to_user(buffer + retval, &event)) {
-                        retval = -EFAULT;
-                        goto out;
-                }
+                if (udev->state != UIST_CREATED)
+                        retval = -ENODEV;
+                else if (udev->head == udev->tail &&
+                         (file->f_flags & O_NONBLOCK))
+                        retval = -EAGAIN;
+                else
+                        retval = uinput_events_to_user(udev, buffer, count);
 
-                retval += input_event_size();
-        }
+                mutex_unlock(&udev->mutex);
 
- out:
-        mutex_unlock(&udev->mutex);
+                if (retval || count == 0)
+                        break;
+
+                if (!(file->f_flags & O_NONBLOCK))
+                        retval = wait_event_interruptible(udev->waitq,
+                                                  udev->head != udev->tail ||
+                                                  udev->state != UIST_CREATED);
+        } while (retval == 0);
 
         return retval;
 }