]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
braino in sg_ioctl_trans()
authorAl Viro <viro@ZenIV.linux.org.uk>
Fri, 6 Feb 2009 00:32:27 +0000 (00:32 +0000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Feb 2009 00:35:52 +0000 (16:35 -0800)
... and yes, gcc is insane enough to eat that without complaint.
We probably want sparse to scream on those...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/compat_ioctl.c

index c8f8d5904f5ee377d817c16ec91ef955ad13f85f..9c6d815dd1918b42640b4819393ac056b21da17f 100644 (file)
@@ -785,7 +785,7 @@ static int sg_ioctl_trans(unsigned int fd, unsigned int cmd, unsigned long arg)
 
        if (copy_in_user(&sgio->status, &sgio32->status,
                         (4 * sizeof(unsigned char)) +
-                        (2 * sizeof(unsigned (short))) +
+                        (2 * sizeof(unsigned short)) +
                         (3 * sizeof(int))))
                return -EFAULT;