aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-10-14 14:34:40 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-14 15:41:51 -0400
commit1ccc9147f6a063c42fef67acff34de18435a4a6b (patch)
treecd64f70d98174ff8a9079362af37ef47ba61746c
parenta39f9d028a48c9dfbc98e8c1504bf96578c65164 (diff)
fw-cdev __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/firewire/fw-cdev.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c
index 75388641a7d3..06471302200f 100644
--- a/drivers/firewire/fw-cdev.c
+++ b/drivers/firewire/fw-cdev.c
@@ -722,10 +722,11 @@ static int ioctl_queue_iso(struct client *client, void *buffer)
722 buffer_end = 0; 722 buffer_end = 0;
723 } 723 }
724 724
725 if (!access_ok(VERIFY_READ, request->packets, request->size)) 725 p = (struct fw_cdev_iso_packet __user *)u64_to_uptr(request->packets);
726
727 if (!access_ok(VERIFY_READ, p, request->size))
726 return -EFAULT; 728 return -EFAULT;
727 729
728 p = (struct fw_cdev_iso_packet __user *)u64_to_uptr(request->packets);
729 end = (void __user *)p + request->size; 730 end = (void __user *)p + request->size;
730 count = 0; 731 count = 0;
731 while (p < end) { 732 while (p < end) {