diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-02-11 10:17:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 10:17:42 +0100 |
| commit | f437e8b53eab92a5829e65781e29aed23d8ffd0c (patch) | |
| tree | 48982c8818a4ac5cddb84ca6a1d55620eb9680ee /fs/compat_ioctl.c | |
| parent | Merge branches 'sched/rt' and 'sched/urgent' into sched/core (diff) | |
| parent | Linux 2.6.29-rc4 (diff) | |
| download | wireguard-linux-f437e8b53eab92a5829e65781e29aed23d8ffd0c.tar.xz wireguard-linux-f437e8b53eab92a5829e65781e29aed23d8ffd0c.zip | |
Merge commit 'v2.6.29-rc4' into sched/core
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 c8f8d5904f5e..9c6d815dd191 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; |