Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bd173c3 authored by Borislav Petkov's avatar Borislav Petkov Committed by Martin K. Petersen
Browse files

scsi: arcmsr: Simplify user_len checking 



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>
Cc: <stable@vger.kernel.org>
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>
parent 182d3f84

drivers/scsi/arcmsr/arcmsr_hba.c

+8 −6
Original line number Diff line number Diff line
@@ -2391,18 +2391,20 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, 
		uint32_t user_len;

		int32_t cnt2end;

		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;

			goto message_out;

		}

		ptmpuserbuffer = ver_addr;

		user_len = pcmdmessagefld->cmdmessage.Length;

		if (user_len > ARCMSR_API_DATA_BUFLEN) {



		ver_addr = kmalloc(ARCMSR_API_DATA_BUFLEN, GFP_ATOMIC);

		if (!ver_addr) {

			retvalue = ARCMSR_MESSAGE_FAIL;

			kfree(ver_addr);

			goto message_out;

		}

		ptmpuserbuffer = ver_addr;



		memcpy(ptmpuserbuffer,

			pcmdmessagefld->messagedatabuffer, user_len);

		spin_lock_irqsave(&acb->wqbuffer_lock, flags);