diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 10:06:28 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 18:09:03 +0100 |
| commit | 8a423e542b4a9af45ac0106ab8275760af770793 (patch) | |
| tree | 5d21bac2d641afcc6e908ea82c98dd52980c561c | |
| parent | [PATCH] m68k: checksum __user annotations (diff) | |
| download | linux-8a423e542b4a9af45ac0106ab8275760af770793.tar.xz linux-8a423e542b4a9af45ac0106ab8275760af770793.zip | |
[PATCH] m68k: amiflop __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/block/amiflop.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c index 4c3b7df46f91..3e2530d61762 100644 --- a/drivers/block/amiflop.c +++ b/drivers/block/amiflop.c @@ -1441,6 +1441,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp, { int drive = iminor(inode) & 3; static struct floppy_struct getprm; + void __user *argp = (void __user *)param; switch(cmd){ case FDFMTBEG: @@ -1486,9 +1487,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp, getprm.head=unit[drive].type->heads; getprm.sect=unit[drive].dtype->sects * unit[drive].type->sect_mult; getprm.size=unit[drive].blocks; - if (copy_to_user((void *)param, - (void *)&getprm, - sizeof(struct floppy_struct))) + if (copy_to_user(argp, &getprm, sizeof(struct floppy_struct))) return -EFAULT; break; case FDSETPRM: @@ -1500,8 +1499,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp, break; #ifdef RAW_IOCTL case IOCTL_RAW_TRACK: - if (copy_to_user((void *)param, raw_buf, - unit[drive].type->read_size)) + if (copy_to_user(argp, raw_buf, unit[drive].type->read_size)) return -EFAULT; else return unit[drive].type->read_size; |