git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
char
/
watchdog
/
machzwd.c
diff --git
a/drivers/char/watchdog/machzwd.c
b/drivers/char/watchdog/machzwd.c
index
99c6b21
..
3782930
100644
(file)
--- a/
drivers/char/watchdog/machzwd.c
+++ b/
drivers/char/watchdog/machzwd.c
@@
-302,13
+302,9
@@
static void zf_ping(unsigned long data)
}
}
}
}
-static ssize_t zf_write(struct file *file, const char *buf, size_t count,
+static ssize_t zf_write(struct file *file, const char
__user
*buf, size_t count,
loff_t *ppos)
{
loff_t *ppos)
{
- /* Can't seek (pwrite) on this device */
- if (ppos != &file->f_pos)
- return -ESPIPE;
-
/* See if we got the magic character */
if(count){
/* See if we got the magic character */
if(count){
@@
-352,15
+348,16
@@
static ssize_t zf_write(struct file *file, const char *buf, size_t count,
static int zf_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long arg)
{
static int zf_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long arg)
{
+ void __user *argp = (void __user *)arg;
+ int __user *p = argp;
switch(cmd){
case WDIOC_GETSUPPORT:
switch(cmd){
case WDIOC_GETSUPPORT:
- if (copy_to_user((struct watchdog_info *)arg,
- &zf_info, sizeof(zf_info)))
+ if (copy_to_user(argp, &zf_info, sizeof(zf_info)))
return -EFAULT;
break;
case WDIOC_GETSTATUS:
return -EFAULT;
break;
case WDIOC_GETSTATUS:
- return put_user(0,
(int *) arg
);
+ return put_user(0,
p
);
case WDIOC_KEEPALIVE:
zf_ping(0);
case WDIOC_KEEPALIVE:
zf_ping(0);
@@
-388,7
+385,7
@@
static int zf_open(struct inode *inode, struct file *file)
zf_timer_on();
zf_timer_on();
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int zf_close(struct inode *inode, struct file *file)
}
static int zf_close(struct inode *inode, struct file *file)