1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index 2926295a936d..c9f87cdc85c1 100644
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -2300,7 +2300,8 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb,
         }
         case ARCMSR_MESSAGE_WRITE_WQBUFFER: {
                 unsigned char *ver_addr;
-                int32_t user_len, cnt2end;
+                uint32_t user_len;
+                int32_t cnt2end;
                 uint8_t *pQbuffer, *ptmpuserbuffer;
                 ver_addr = kmalloc(ARCMSR_API_DATA_BUFLEN, GFP_ATOMIC);
                 if (!ver_addr) {
@@ -2309,6 +2310,11 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb,
                 }
                 ptmpuserbuffer = ver_addr;
                 user_len = pcmdmessagefld->cmdmessage.Length;
+                if (user_len > ARCMSR_API_DATA_BUFLEN) {
+                        retvalue = ARCMSR_MESSAGE_FAIL;
+                        kfree(ver_addr);
+                        goto message_out;
+                }
                 memcpy(ptmpuserbuffer,
                         pcmdmessagefld->messagedatabuffer, user_len);
                 spin_lock_irqsave(&acb->wqbuffer_lock, flags);