wdt285: fix sparse warnings
The wdt285.c watchdog driver is producing a number of sparse errors due to missing __user attributes to calls to put_user and copy_to_user, as well as in the prototype of watchdog_write.
wdt285.c:144:21: warning: incorrect type in argument 1 (different address spaces)
wdt285.c:144:21: expected void [noderef] <asn:1>*to
wdt285.c:144:21: got void *<noident>
wdt285.c:150:9: warning: incorrect type in initializer (different address spaces)
wdt285.c:150:9: expected int const [noderef] <asn:1>*register __p
wdt285.c:150:9: got int *<noident>
wdt285.c:159:9: warning: incorrect type in initializer (different address spaces)
wdt285.c:159:9: expected int const [noderef] <asn:1>*register __p
wdt285.c:159:9: got int *<noident>
wdt285.c:174:9: warning: incorrect type in initializer (different address spaces)
wdt285.c:174:9: expected int const [noderef] <asn:1>*register __p
wdt285.c:174:9: got int *<noident>
wdt285.c:183:12: warning: incorrect type in initializer (incompatible argument 2 (different address spaces))
wdt285.c:183:12: expected int ( *write )( ... )
wdt285.c:183:12: got int ( static [toplevel] *<noident> )( ... )
drivers/watchdog/wdt285.c +6 -6
@@ -115,8 +115,8 @@ static int watchdog_release(struct inodereturn 0 ; } -static ssize_t watchdog_write (struct file *file,const char *data, -size_t len,loff_t *ppos) +static ssize_t watchdog_write (struct file *file,const char __user *data, +size_t len,loff_t *ppos) {/* * Refresh the timer.
@@ -141,13 +141,13 @@ static long watchdog_ioctl(struct file *switch (cmd) {case WDIOC_GETSUPPORT : ret =0 ; -if (copy_to_user ((void *)arg, &ident,sizeof (ident))) +if (copy_to_user ((void __user *)arg, &ident,sizeof (ident))) ret = -EFAULT ;break ;case WDIOC_GETSTATUS :case WDIOC_GETBOOTSTATUS : - ret =put_user (0 , (int *)arg); + ret =put_user (0 , (int __user *)arg);break ;case WDIOC_KEEPALIVE :
@@ -156,7 +156,7 @@ static long watchdog_ioctl(struct file *break ;case WDIOC_SETTIMEOUT : - ret =get_user (new_margin, (int *)arg); + ret =get_user (new_margin, (int __user *)arg);if (ret)break ;
@@ -171,7 +171,7 @@ static long watchdog_ioctl(struct file *watchdog_ping ();/* Fall */ case WDIOC_GETTIMEOUT : - ret =put_user (soft_margin, (int *)arg); + ret =put_user (soft_margin, (int __user *)arg);break ; }return ret;
Signature · 3 lines
Ben ([email protected], http://www.fluff.org/) 'a smiley only costs 4 bytes'
Ben,
...
drivers/watchdog/wdt285.c static long watchdog_ioctl(struct file * · line 147
Quoted 9 lines
drivers/watchdog/wdt285.c +1
-1@@ -141,13 +141,13 @@ static long watchdog_ioctl(struct file *switch (cmd) {case WDIOC_GETSUPPORT : ret =0 ; -if (copy_to_user ((void *)arg, &ident,sizeof (ident))) +if (copy_to_user ((void __user *)arg, &ident,sizeof (ident))) ret = -EFAULT ;break ;
...
Isn't it better to fix this like we did with the other watchdog drivers:
void __user *argp = (void __user *)arg;
int __user *p = argp;
...
if (copy_to_user(argp, &ident, sizeof(ident)))
...Regards,
Wim.
Quoted 14 lines · Wim Van Sebroeck
Ben,
...
Quoted 9 lines
drivers/watchdog/wdt285.c +1
-1@@ -141,13 +141,13 @@ static long watchdog_ioctl(struct file *switch (cmd) {case WDIOC_GETSUPPORT : ret =0 ; -if (copy_to_user ((void *)arg, &ident,sizeof (ident))) +if (copy_to_user ((void __user *)arg, &ident,sizeof (ident))) ret = -EFAULT ;break ;...
Quoted 3 lines
Isn't it better to fix this like we did with the other watchdog drivers:
void __user *argp = (void __user *)arg; int __user *p = argp;
I've changed the int pointer, as it is used numerous times, but left the void as it is only used in the copy_to_user.
...
Quoted 11 lines
if (copy_to_user(argp, &ident, sizeof(ident))) ...Regards,
Wim.--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Signature · 3 lines
Ben ([email protected], http://www.fluff.org/) 'a smiley only costs 4 bytes'