diff options
author | James Bottomley <James.Bottomley@suse.de> | 2010-05-18 10:33:43 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-05-18 10:37:41 -0400 |
commit | 95bb335c0ebe96afe926387a1ef3a096bd884a82 (patch) | |
tree | 56115332b4f2f7ef300c36248a6a7d20db2e639d /drivers/scsi/pmcraid.c | |
parent | 1b4d0d8ea7b3cbd107f345ab766416f9b38ce66a (diff) | |
parent | 9cccde93fed1ca988eb2fb17ab9194bf7b5ed1b0 (diff) |
[SCSI] Merge scsi-misc-2.6 into scsi-rc-fixes-2.6
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/pmcraid.c')
-rw-r--r-- | drivers/scsi/pmcraid.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index 53aefffbaead..c44e4ab4e938 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c | |||
@@ -3751,12 +3751,6 @@ static int pmcraid_check_ioctl_buffer( | |||
3751 | return -EINVAL; | 3751 | return -EINVAL; |
3752 | } | 3752 | } |
3753 | 3753 | ||
3754 | /* buffer length can't be negetive */ | ||
3755 | if (hdr->buffer_length < 0) { | ||
3756 | pmcraid_err("ioctl: invalid buffer length specified\n"); | ||
3757 | return -EINVAL; | ||
3758 | } | ||
3759 | |||
3760 | /* check for appropriate buffer access */ | 3754 | /* check for appropriate buffer access */ |
3761 | if ((_IOC_DIR(cmd) & _IOC_READ) == _IOC_READ) | 3755 | if ((_IOC_DIR(cmd) & _IOC_READ) == _IOC_READ) |
3762 | access = VERIFY_WRITE; | 3756 | access = VERIFY_WRITE; |