diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-15 08:12:00 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-15 08:12:00 +0100 |
| commit | 5e30589521518bff36fd2638b3c3d69679c50436 (patch) | |
| tree | 6ac985658a06b0787e4354d0d16d380ea9b16a5a /fs/compat_ioctl.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| parent | Linux 2.6.29-rc5 (diff) | |
| download | linux-5e30589521518bff36fd2638b3c3d69679c50436.tar.xz linux-5e30589521518bff36fd2638b3c3d69679c50436.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'fs/compat_ioctl.c')
| -rw-r--r-- | fs/compat_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index c03c10d7fb6b..64f406593c0e 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; |