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

Commit 6371e0cd authored by Dan Carpenter's avatar Dan Carpenter Committed by Sasha Levin
Browse files

scsi: arcmsr: Buffer overflow in arcmsr_iop_message_xfer() 



[ Upstream commit 7bc2b55a5c030685b399bb65b6baa9ccc3d1f167 ]

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

Cc: <stable@vger.kernel.org>
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 avatarSasha Levin <alexander.levin@verizon.com>
parent 1cb57d81

drivers/scsi/arcmsr/arcmsr_hba.c

+7 −1
Original line number Diff line number Diff line
@@ -2305,7 +2305,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) {
@@ -2314,6 +2315,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);