Commit 161cbfec authored by Borislav Petkov's avatar Borislav Petkov Committed by Greg Kroah-Hartman

scsi: arcmsr: Simplify user_len checking

commit 4bd173c3 upstream.

Do the user_len check first and then the ver_addr allocation so that we
can save us the kfree() on the error path when user_len is >
ARCMSR_API_DATA_BUFLEN.
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Marco Grassi <marco.gra@gmail.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Tomas Henzl <thenzl@redhat.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 24040922
...@@ -2300,18 +2300,20 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, ...@@ -2300,18 +2300,20 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb,
uint32_t user_len; uint32_t user_len;
int32_t cnt2end; int32_t cnt2end;
uint8_t *pQbuffer, *ptmpuserbuffer; uint8_t *pQbuffer, *ptmpuserbuffer;
ver_addr = kmalloc(ARCMSR_API_DATA_BUFLEN, GFP_ATOMIC);
if (!ver_addr) { user_len = pcmdmessagefld->cmdmessage.Length;
if (user_len > ARCMSR_API_DATA_BUFLEN) {
retvalue = ARCMSR_MESSAGE_FAIL; retvalue = ARCMSR_MESSAGE_FAIL;
goto message_out; goto message_out;
} }
ptmpuserbuffer = ver_addr;
user_len = pcmdmessagefld->cmdmessage.Length; ver_addr = kmalloc(ARCMSR_API_DATA_BUFLEN, GFP_ATOMIC);
if (user_len > ARCMSR_API_DATA_BUFLEN) { if (!ver_addr) {
retvalue = ARCMSR_MESSAGE_FAIL; retvalue = ARCMSR_MESSAGE_FAIL;
kfree(ver_addr);
goto message_out; goto message_out;
} }
ptmpuserbuffer = ver_addr;
memcpy(ptmpuserbuffer, memcpy(ptmpuserbuffer,
pcmdmessagefld->messagedatabuffer, user_len); pcmdmessagefld->messagedatabuffer, user_len);
spin_lock_irqsave(&acb->wqbuffer_lock, flags); spin_lock_irqsave(&acb->wqbuffer_lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment