diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2011-05-26 11:52:04 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-05-26 11:52:04 -0400 |
| commit | 7a0287df3e83a0012dfc496d4a8af9c1c5b126ef (patch) | |
| tree | 27cc2f768de7e9014ffa899117bf219d0f20fb5e /drivers/scsi/pmcraid.c | |
| parent | 6738d3210aabe3016a1b03cd98a7fc479c229197 (diff) | |
| parent | 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf (diff) | |
Merge tag 'v2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
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 96d5ad0c1e42..7f636b118287 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c | |||
| @@ -3814,6 +3814,9 @@ static long pmcraid_ioctl_passthrough( | |||
| 3814 | rc = -EFAULT; | 3814 | rc = -EFAULT; |
| 3815 | goto out_free_buffer; | 3815 | goto out_free_buffer; |
| 3816 | } | 3816 | } |
| 3817 | } else if (request_size < 0) { | ||
| 3818 | rc = -EINVAL; | ||
| 3819 | goto out_free_buffer; | ||
| 3817 | } | 3820 | } |
| 3818 | 3821 | ||
| 3819 | /* check if we have any additional command parameters */ | 3822 | /* check if we have any additional command parameters */ |