diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2016-02-28 17:44:09 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2016-03-01 15:29:42 +0100 |
| commit | 10e7ac22cdd4d211cef99afcb9371b70cb175be6 (patch) | |
| tree | bf9e63aa2829e06b7ac29d125d7db8712ae850fd /drivers/watchdog | |
| parent | 972ec3510330c9d639c0dd72960e9aa02915855c (diff) | |
| download | linux-10e7ac22cdd4d211cef99afcb9371b70cb175be6.tar.gz | |
watchdog: rc32434_wdt: fix ioctl error handling
Calling return copy_to_user(...) in an ioctl will not do the right thing if there's a pagefault: copy_to_user returns the number of bytes not copied in this case. Fix up watchdog/rc32434_wdt to do return copy_to_user(...)) ? -EFAULT : 0; instead. Cc: stable@vger.kernel.org Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/rc32434_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c index 71e78ef4b736..3a75f3b53452 100644 --- a/drivers/watchdog/rc32434_wdt.c +++ b/drivers/watchdog/rc32434_wdt.c @@ -237,7 +237,7 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd, return -EINVAL; /* Fall through */ case WDIOC_GETTIMEOUT: - return copy_to_user(argp, &timeout, sizeof(int)); + return copy_to_user(argp, &timeout, sizeof(int)) ? -EFAULT : 0; default: return -ENOTTY; } |