diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-01-05 19:41:44 +0900 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-02-08 13:43:18 -0600 |
| commit | 84eb8fb42c120ff32b201c1cdd910033c888f699 (patch) | |
| tree | 6524fd3b36c939f532b579448e6a5fbda47d02b7 | |
| parent | 0f19bc681ed0849a2b95778460a0a8132e3700e2 (diff) | |
| download | op-kernel-dev-84eb8fb42c120ff32b201c1cdd910033c888f699.zip op-kernel-dev-84eb8fb42c120ff32b201c1cdd910033c888f699.tar.gz | |
[SCSI] compat_ioct: fix bsg SG_IO
bsg's SG_IO doesn't work on 32-bit userspace and 64-bit kernelspace.
The problem is that both sg and bsg drivers use SG_IO
ioctl. sg_ioctl_trans() does 32/64-bit conversion even against bsg
header. It messes up bsg header. bsg driver gets garbage.
This patch fixes sg_ioctl_trans to handle only sg header (struct
sg_io_hdr).
Reported-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
| -rw-r--r-- | fs/compat_ioctl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index c5c45de..7cbbc7a 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -301,6 +301,12 @@ static int sg_ioctl_trans(unsigned int fd, unsigned int cmd, u32 data; void __user *dxferp; int err; + int interface_id; + + if (get_user(interface_id, &sgio32->interface_id)) + return -EFAULT; + if (interface_id != 'S') + return sys_ioctl(fd, cmd, (unsigned long)sgio32); if (get_user(iovec_count, &sgio32->iovec_count)) return -EFAULT; |
