Commit bc05d83b authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] sparc: jsflash __user annotations


Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b7c690b5
...@@ -249,11 +249,11 @@ static loff_t jsf_lseek(struct file * file, loff_t offset, int orig) ...@@ -249,11 +249,11 @@ static loff_t jsf_lseek(struct file * file, loff_t offset, int orig)
/* /*
* OS SIMM Cannot be read in other size but a 32bits word. * OS SIMM Cannot be read in other size but a 32bits word.
*/ */
static ssize_t jsf_read(struct file * file, char * buf, static ssize_t jsf_read(struct file * file, char __user * buf,
size_t togo, loff_t *ppos) size_t togo, loff_t *ppos)
{ {
unsigned long p = *ppos; unsigned long p = *ppos;
char *tmp = buf; char __user *tmp = buf;
union byte4 { union byte4 {
char s[4]; char s[4];
...@@ -305,7 +305,7 @@ static ssize_t jsf_read(struct file * file, char * buf, ...@@ -305,7 +305,7 @@ static ssize_t jsf_read(struct file * file, char * buf,
return tmp-buf; return tmp-buf;
} }
static ssize_t jsf_write(struct file * file, const char * buf, static ssize_t jsf_write(struct file * file, const char __user * buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
return -ENOSPC; return -ENOSPC;
...@@ -356,10 +356,10 @@ static int jsf_ioctl_erase(unsigned long arg) ...@@ -356,10 +356,10 @@ static int jsf_ioctl_erase(unsigned long arg)
* Program a block of flash. * Program a block of flash.
* Very simple because we can do it byte by byte anyway. * Very simple because we can do it byte by byte anyway.
*/ */
static int jsf_ioctl_program(unsigned long arg) static int jsf_ioctl_program(void __user *arg)
{ {
struct jsflash_program_arg abuf; struct jsflash_program_arg abuf;
char *uptr; char __user *uptr;
unsigned long p; unsigned long p;
unsigned int togo; unsigned int togo;
union { union {
...@@ -367,13 +367,13 @@ static int jsf_ioctl_program(unsigned long arg) ...@@ -367,13 +367,13 @@ static int jsf_ioctl_program(unsigned long arg)
char s[4]; char s[4];
} b; } b;
if (copy_from_user(&abuf, (char *)arg, JSFPRGSZ)) if (copy_from_user(&abuf, arg, JSFPRGSZ))
return -EFAULT; return -EFAULT;
p = abuf.off; p = abuf.off;
togo = abuf.size; togo = abuf.size;
if ((togo & 3) || (p & 3)) return -EINVAL; if ((togo & 3) || (p & 3)) return -EINVAL;
uptr = (char *) (unsigned long) abuf.data; uptr = (char __user *) (unsigned long) abuf.data;
while (togo != 0) { while (togo != 0) {
togo -= 4; togo -= 4;
if (copy_from_user(&b.s[0], uptr, 4)) if (copy_from_user(&b.s[0], uptr, 4))
...@@ -390,19 +390,20 @@ static int jsf_ioctl(struct inode *inode, struct file *f, unsigned int cmd, ...@@ -390,19 +390,20 @@ static int jsf_ioctl(struct inode *inode, struct file *f, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
int error = -ENOTTY; int error = -ENOTTY;
void __user *argp = (void __user *)arg;
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
switch (cmd) { switch (cmd) {
case JSFLASH_IDENT: case JSFLASH_IDENT:
if (copy_to_user((void *)arg, &jsf0.id, JSFIDSZ)) if (copy_to_user(argp, &jsf0.id, JSFIDSZ))
return -EFAULT; return -EFAULT;
break; break;
case JSFLASH_ERASE: case JSFLASH_ERASE:
error = jsf_ioctl_erase(arg); error = jsf_ioctl_erase(arg);
break; break;
case JSFLASH_PROGRAM: case JSFLASH_PROGRAM:
error = jsf_ioctl_program(arg); error = jsf_ioctl_program(argp);
break; break;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment