mv64x60_wdt __user annotations and cleanups
PATCH 1/1 mv64x60_wdt __user annotations and cleanups
* use nonseekable_open() instead of messing with if (*ppos != file->f_pos) return -EISPIPE
in ->write() (->read is NULL).
* trivial __user annotations
Signed-off-by Al Viro <[email protected]>
----
drivers/char/watchdog/mv64x60_wdt.c +7 -7
@@ -87,6 +87,8 @@mv64x60_wdt_service ();mv64x60_wdt_handler_enable (); +nonseekable_open (inode, file); +return 0 ; }
@@ -103,12 +105,9 @@return 0 ; } -static ssize_t mv64x60_wdt_write (struct file *file,const char *data, +static ssize_t mv64x60_wdt_write (struct file *file,const char __user *data,size_t len,loff_t * ppos) { -if (*ppos != file->f_pos) -return -ESPIPE ; -if (len)mv64x60_wdt_service ();
@@ -119,6 +118,7 @@ unsigned int cmd, unsigned long arg) { int timeout; +void __user *argp = (void __user *)arg; static struct watchdog_info info = { .options = WDIOF_KEEPALIVEPING, .firmware_version = 0,
@@ -127,13 +127,13 @@switch (cmd) {case WDIOC_GETSUPPORT : -if (copy_to_user ((void *)arg, &info,sizeof (info))) +if (copy_to_user (argp, &info,sizeof (info)))return -EFAULT ;break ;case WDIOC_GETSTATUS :case WDIOC_GETBOOTSTATUS : -if (put_user (wdt_status, (int *)arg)) +if (put_user (wdt_status, (int __user *)argp))return -EFAULT ; wdt_status &= ~WDIOF_KEEPALIVEPING ;break ;
@@ -154,7 +154,7 @@case WDIOC_GETTIMEOUT : timeout = mv64x60_wdt_timeout *HZ ; -if (put_user (timeout, (int *)arg)) +if (put_user (timeout, (int __user *)argp))return -EFAULT ;break ;