forked from Minki/linux
[PATCH] devio __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
cb04e6b619
commit
c714de5dcf
@ -1216,7 +1216,7 @@ static int proc_submiturb_compat(struct dev_state *ps, void __user *arg)
|
||||
{
|
||||
struct usbdevfs_urb uurb;
|
||||
|
||||
if (get_urb32(&uurb,(struct usbdevfs_urb32 *)arg))
|
||||
if (get_urb32(&uurb,(struct usbdevfs_urb32 __user *)arg))
|
||||
return -EFAULT;
|
||||
|
||||
return proc_do_submiturb(ps, &uurb, ((struct usbdevfs_urb32 __user *)arg)->iso_frame_desc, arg);
|
||||
@ -1251,7 +1251,7 @@ static int processcompl_compat(struct async *as, void __user * __user *arg)
|
||||
}
|
||||
|
||||
free_async(as);
|
||||
if (put_user((u32)(u64)addr, (u32 __user *)arg))
|
||||
if (put_user(ptr_to_compat(addr), (u32 __user *)arg))
|
||||
return -EFAULT;
|
||||
return 0;
|
||||
}
|
||||
@ -1520,7 +1520,7 @@ static int usbdev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
|
||||
|
||||
case USBDEVFS_IOCTL32:
|
||||
snoop(&dev->dev, "%s: IOCTL\n", __FUNCTION__);
|
||||
ret = proc_ioctl_compat(ps, (compat_uptr_t)(long)p);
|
||||
ret = proc_ioctl_compat(ps, ptr_to_compat(p));
|
||||
break;
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user