From 7485c797cfe4b6d9abf5a9f0a0ba9e59aa547470 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 14 Oct 2007 19:34:40 +0100 Subject: [PATCH] --- yaml --- r: 68684 b: refs/heads/master c: 1ccc9147f6a063c42fef67acff34de18435a4a6b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/firewire/fw-cdev.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 20acac1035bc..82ba215cfddf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a39f9d028a48c9dfbc98e8c1504bf96578c65164 +refs/heads/master: 1ccc9147f6a063c42fef67acff34de18435a4a6b diff --git a/trunk/drivers/firewire/fw-cdev.c b/trunk/drivers/firewire/fw-cdev.c index 75388641a7d3..06471302200f 100644 --- a/trunk/drivers/firewire/fw-cdev.c +++ b/trunk/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) {