diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-29 16:27:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-29 16:27:52 -0700 |
| commit | 1be6a1f89f131e9c3d22f819ec542be9cda8c9e3 (patch) | |
| tree | f5a98ccdd1e9b825c32dbfda4a7fc529a0f2ce83 /drivers/scsi/pmcraid.c | |
| parent | 40a963502cd44765a0e0d45ff3409051986b5a39 (diff) | |
| parent | 5f6279da3760ce48f478f2856aacebe0c59a39f3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] pmcraid: reject negative request size
[SCSI] put stricter guards on queue dead checks
[SCSI] scsi_dh: fix reference counting in scsi_dh_activate error path
[SCSI] mpt2sas: prevent heap overflows and unchecked reads
Diffstat (limited to 'drivers/scsi/pmcraid.c')
| -rw-r--r-- | drivers/scsi/pmcraid.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index 96d5ad0c1e4..7f636b11828 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c @@ -3814,6 +3814,9 @@ static long pmcraid_ioctl_passthrough( rc = -EFAULT; goto out_free_buffer; } + } else if (request_size < 0) { + rc = -EINVAL; + goto out_free_buffer; } /* check if we have any additional command parameters */ |