@@ -147,10 +147,13 @@ static ssize_t uleds_read(struct file *file, char __user *buffer, size_t count,
} else if (!udev->new_data && (file->f_flags & O_NONBLOCK)) {
retval = -EAGAIN;
} else if (udev->new_data) {
- retval = copy_to_user(buffer, &udev->brightness,
- sizeof(udev->brightness));
- udev->new_data = false;
- retval = sizeof(udev->brightness);
+ if (copy_to_user(buffer, &udev->brightness,
+ sizeof(udev->brightness))) {
+ retval = -EFAULT;
+ } else {
+ udev->new_data = false;
+ retval = sizeof(udev->brightness);
+ }
}
mutex_unlock(&udev->mutex);
The copy_to_user() is annotated with __must_check, indicating that its return value must be checked by the caller. Currently, uleds_read() ignores it. If the userspace buffer is invalid and copy_to_user() fails, the userspace application may assume it has received fresh data, while in fact copying has failed. This can leave applications out of sync with the actual device state. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: e381322b0190 ("leds: Introduce userspace LED class driver") Signed-off-by: Ivan Stepchenko <sid@itb.spb.ru> --- drivers/leds/uleds.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)