Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1375896
| From | Jiri Slaby <jslaby@suse.cz> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 3.12 75/98] watchdog: rc32434_wdt: fix ioctl error handling |
| Date | 2016-04-11 15:40 +0200 |
| Message-ID | <rmKep-6GA-91@gated-at.bofh.it> (permalink) |
| References | <rmK4G-6zt-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: "Michael S. Tsirkin" <mst@redhat.com> 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit 10e7ac22cdd4d211cef99afcb9371b70cb175be6 upstream. 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. 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> Signed-off-by: Jiri Slaby <jslaby@suse.cz> --- drivers/watchdog/rc32434_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c index 9cf6bc7a234f..6f1ffd94a202 100644 --- a/drivers/watchdog/rc32434_wdt.c +++ b/drivers/watchdog/rc32434_wdt.c @@ -238,7 +238,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; } -- 2.8.1
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
[PATCH 3.12 75/98] watchdog: rc32434_wdt: fix ioctl error handling Jiri Slaby <jslaby@suse.cz> - 2016-04-11 15:40 +0200
csiph-web