Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[PATCH] 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 <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
authored by Al Viro and committed by Linus Torvalds b2846dfa ae8aed03
+7
-7
drivers/char/watchdog/mv64x60_wdt.c
+7
-7
drivers/char/watchdog/mv64x60_wdt.c
···
87
mv64x60_wdt_service();
88
mv64x60_wdt_handler_enable();
89
90
return 0;
91
}
92
···
105
return 0;
106
}
107
108
-
static ssize_t mv64x60_wdt_write(struct file *file, const char *data,
109
size_t len, loff_t * ppos)
110
{
111
-
if (*ppos != file->f_pos)
112
-
return -ESPIPE;
113
-
114
if (len)
115
mv64x60_wdt_service();
116
···
118
unsigned int cmd, unsigned long arg)
119
{
120
int timeout;
121
static struct watchdog_info info = {
122
.options = WDIOF_KEEPALIVEPING,
123
.firmware_version = 0,
···
127
128
switch (cmd) {
129
case WDIOC_GETSUPPORT:
130
-
if (copy_to_user((void *)arg, &info, sizeof(info)))
131
return -EFAULT;
132
break;
133
134
case WDIOC_GETSTATUS:
135
case WDIOC_GETBOOTSTATUS:
136
-
if (put_user(wdt_status, (int *)arg))
137
return -EFAULT;
138
wdt_status &= ~WDIOF_KEEPALIVEPING;
139
break;
···
154
155
case WDIOC_GETTIMEOUT:
156
timeout = mv64x60_wdt_timeout * HZ;
157
-
if (put_user(timeout, (int *)arg))
158
return -EFAULT;
159
break;
160
···
87
mv64x60_wdt_service();
88
mv64x60_wdt_handler_enable();
89
90
+
nonseekable_open(inode, file);
91
+
92
return 0;
93
}
94
···
103
return 0;
104
}
105
106
+
static ssize_t mv64x60_wdt_write(struct file *file, const char __user *data,
107
size_t len, loff_t * ppos)
108
{
109
if (len)
110
mv64x60_wdt_service();
111
···
119
unsigned int cmd, unsigned long arg)
120
{
121
int timeout;
122
+
void __user *argp = (void __user *)arg;
123
static struct watchdog_info info = {
124
.options = WDIOF_KEEPALIVEPING,
125
.firmware_version = 0,
···
127
128
switch (cmd) {
129
case WDIOC_GETSUPPORT:
130
+
if (copy_to_user(argp, &info, sizeof(info)))
131
return -EFAULT;
132
break;
133
134
case WDIOC_GETSTATUS:
135
case WDIOC_GETBOOTSTATUS:
136
+
if (put_user(wdt_status, (int __user *)argp))
137
return -EFAULT;
138
wdt_status &= ~WDIOF_KEEPALIVEPING;
139
break;
···
154
155
case WDIOC_GETTIMEOUT:
156
timeout = mv64x60_wdt_timeout * HZ;
157
+
if (put_user(timeout, (int __user *)argp))
158
return -EFAULT;
159
break;
160