Skip to content

Commit

Permalink
[PATCH] idmouse cleanup and overflow fix
Browse files Browse the repository at this point in the history
switched to simple_read_from_buffer(), killed broken use of min().
Incidentally, that use of min() had been fixed once, only to be
reintroduced in commit 4244f72:

    [PATCH] USB: upgrade of the idmouse driver

[snip]
-       if (count > IMGSIZE - *ppos)
-               count = IMGSIZE - *ppos;
+       count = min ((loff_t)count, IMGSIZE - (*ppos));

Note the lovely use of cast to shut the warning about misuse of min()
up...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Oct 29, 2005
1 parent 32b32c2 commit 018a2cd
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions drivers/usb/misc/idmouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -319,20 +319,8 @@ static ssize_t idmouse_read(struct file *file, char __user *buffer, size_t count
return -ENODEV;
}

if (*ppos >= IMGSIZE) {
up (&dev->sem);
return 0;
}

count = min ((loff_t)count, IMGSIZE - (*ppos));

if (copy_to_user (buffer, dev->bulk_in_buffer + *ppos, count)) {
result = -EFAULT;
} else {
result = count;
*ppos += count;
}

result = simple_read_from_buffer(buffer, count, ppos,
dev->bulk_in_buffer, IMGSIZE);
/* unlock the device */
up(&dev->sem);
return result;
Expand Down

0 comments on commit 018a2cd

Please sign in to comment.