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

Commit 24040922 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

scsi: arcmsr: Buffer overflow in arcmsr_iop_message_xfer() 



commit 7bc2b55a5c030685b399bb65b6baa9ccc3d1f167 upstream.

We need to put an upper bound on "user_len" so the memcpy() doesn't
overflow.

Reported-by: default avatarMarco Grassi <marco.gra@gmail.com>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
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 ffb3c7a9

drivers/scsi/arcmsr/arcmsr_hba.c

+7 −1
Original line number Diff line number Diff line
@@ -2297,7 +2297,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) {
@@ -2306,6 +2307,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);