summary refs log tree commit diff
path: root/drivers/firewire
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-10-14 19:34:40 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-14 12:41:51 -0700
commit1ccc9147f6a063c42fef67acff34de18435a4a6b (patch)
treecd64f70d98174ff8a9079362af37ef47ba61746c /drivers/firewire
parenta39f9d028a48c9dfbc98e8c1504bf96578c65164 (diff)
downloadlinux-1ccc9147f6a063c42fef67acff34de18435a4a6b.tar.gz
fw-cdev __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/firewire')
-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)
 		buffer_end = 0;
 	}
 
-	if (!access_ok(VERIFY_READ, request->packets, request->size))
+	p = (struct fw_cdev_iso_packet __user *)u64_to_uptr(request->packets);
+
+	if (!access_ok(VERIFY_READ, p, request->size))
 		return -EFAULT;
 
-	p = (struct fw_cdev_iso_packet __user *)u64_to_uptr(request->packets);
 	end = (void __user *)p + request->size;
 	count = 0;
 	while (p < end) {