Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index ef623bd965f5..4fe79cd7c957 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -85,6 +85,10 @@ static int ioctl_send_fib(struct aac_dev * dev, void __user *arg)
         if (size < le16_to_cpu(kfib->header.SenderSize))
                 size = le16_to_cpu(kfib->header.SenderSize);
         if (size > dev->max_fib_size) {
+                if (size > 2048) {
+                        retval = -EINVAL;
+                        goto cleanup;
+                }
                 /* Highjack the hw_fib */
                 hw_fib = fibptr->hw_fib;
                 hw_fib_pa = fibptr->hw_fib_pa;