[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>
This commit is contained in:
Родитель
6225d85f17
Коммит
8a423e542b
|
@ -1441,6 +1441,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
|
||||||
{
|
{
|
||||||
int drive = iminor(inode) & 3;
|
int drive = iminor(inode) & 3;
|
||||||
static struct floppy_struct getprm;
|
static struct floppy_struct getprm;
|
||||||
|
void __user *argp = (void __user *)param;
|
||||||
|
|
||||||
switch(cmd){
|
switch(cmd){
|
||||||
case FDFMTBEG:
|
case FDFMTBEG:
|
||||||
|
@ -1486,9 +1487,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
|
||||||
getprm.head=unit[drive].type->heads;
|
getprm.head=unit[drive].type->heads;
|
||||||
getprm.sect=unit[drive].dtype->sects * unit[drive].type->sect_mult;
|
getprm.sect=unit[drive].dtype->sects * unit[drive].type->sect_mult;
|
||||||
getprm.size=unit[drive].blocks;
|
getprm.size=unit[drive].blocks;
|
||||||
if (copy_to_user((void *)param,
|
if (copy_to_user(argp, &getprm, sizeof(struct floppy_struct)))
|
||||||
(void *)&getprm,
|
|
||||||
sizeof(struct floppy_struct)))
|
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
break;
|
break;
|
||||||
case FDSETPRM:
|
case FDSETPRM:
|
||||||
|
@ -1500,8 +1499,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
|
||||||
break;
|
break;
|
||||||
#ifdef RAW_IOCTL
|
#ifdef RAW_IOCTL
|
||||||
case IOCTL_RAW_TRACK:
|
case IOCTL_RAW_TRACK:
|
||||||
if (copy_to_user((void *)param, raw_buf,
|
if (copy_to_user(argp, raw_buf, unit[drive].type->read_size))
|
||||||
unit[drive].type->read_size))
|
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
else
|
else
|
||||||
return unit[drive].type->read_size;
|
return unit[drive].type->read_size;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче