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
/
acquirewdt.c
diff --git
a/drivers/char/watchdog/acquirewdt.c
b/drivers/char/watchdog/acquirewdt.c
index
acb25de
..
8f30212
100644
(file)
--- a/
drivers/char/watchdog/acquirewdt.c
+++ b/
drivers/char/watchdog/acquirewdt.c
@@
-111,12
+111,8
@@
static void acq_stop(void)
* /dev/watchdog handling.
*/
* /dev/watchdog handling.
*/
-static ssize_t acq_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
+static ssize_t acq_write(struct file *file, const char
__user
*buf, size_t count, loff_t *ppos)
{
{
- /* Can't seek (pwrite) on this device */
- if (ppos != &file->f_pos)
- return -ESPIPE;
-
/* See if we got the magic character 'V' and reload the timer */
if(count) {
if (!nowayout) {
/* See if we got the magic character 'V' and reload the timer */
if(count) {
if (!nowayout) {
@@
-146,6
+142,8
@@
static int acq_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long arg)
{
int options, retval = -EINVAL;
unsigned long arg)
{
int options, retval = -EINVAL;
+ void __user *argp = (void __user *)arg;
+ int __user *p = argp;
static struct watchdog_info ident =
{
.options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
static struct watchdog_info ident =
{
.options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
@@
-156,22
+154,22
@@
static int acq_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
switch(cmd)
{
case WDIOC_GETSUPPORT:
switch(cmd)
{
case WDIOC_GETSUPPORT:
- return copy_to_user(
(struct watchdog_info *)arg
, &ident, sizeof(ident)) ? -EFAULT : 0;
+ return copy_to_user(
argp
, &ident, sizeof(ident)) ? -EFAULT : 0;
case WDIOC_GETSTATUS:
case WDIOC_GETBOOTSTATUS:
case WDIOC_GETSTATUS:
case WDIOC_GETBOOTSTATUS:
- return put_user(0,
(int *)arg
);
+ return put_user(0,
p
);
case WDIOC_KEEPALIVE:
acq_keepalive();
return 0;
case WDIOC_GETTIMEOUT:
case WDIOC_KEEPALIVE:
acq_keepalive();
return 0;
case WDIOC_GETTIMEOUT:
- return put_user(WATCHDOG_HEARTBEAT,
(int *)arg
);
+ return put_user(WATCHDOG_HEARTBEAT,
p
);
case WDIOC_SETOPTIONS:
{
case WDIOC_SETOPTIONS:
{
- if (get_user(options,
(int *)arg
))
+ if (get_user(options,
p
))
return -EFAULT;
if (options & WDIOS_DISABLECARD)
return -EFAULT;
if (options & WDIOS_DISABLECARD)
@@
-204,7
+202,7
@@
static int acq_open(struct inode *inode, struct file *file)
/* Activate */
acq_keepalive();
/* Activate */
acq_keepalive();
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int acq_close(struct inode *inode, struct file *file)
}
static int acq_close(struct inode *inode, struct file *file)