From: Al Viro <viro@ZenIV.linux.org.uk>
Date: Fri, 6 Feb 2009 00:32:27 +0000 (+0000)
Subject: braino in sg_ioctl_trans()
X-Git-Tag: v2.6.29-rc4~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=767b5828ad9a1b435488b5d39b5a66aeef4d25e4;p=thirdparty%2Flinux.git

braino in sg_ioctl_trans()

... 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>
---

diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index c8f8d5904f5ee..9c6d815dd1918 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -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;