Patch "scsi: arcmsr: Buffer overflow in arcmsr_iop_message_xfer()" has been added to the 4.4-stable tree
From: <gregkh@linuxfoundation.org>
Date: 2016-10-20 15:53:20
This is a note to let you know that I've just added the patch titled
scsi: arcmsr: Buffer overflow in arcmsr_iop_message_xfer()
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
scsi-arcmsr-buffer-overflow-in-arcmsr_iop_message_xfer.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.
From 7bc2b55a5c030685b399bb65b6baa9ccc3d1f167 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <redacted> Date: Thu, 15 Sep 2016 16:44:56 +0300 Subject: scsi: arcmsr: Buffer overflow in arcmsr_iop_message_xfer() From: Dan Carpenter <redacted> commit 7bc2b55a5c030685b399bb65b6baa9ccc3d1f167 upstream. We need to put an upper bound on "user_len" so the memcpy() doesn't overflow. Reported-by: Marco Grassi <redacted> Signed-off-by: Dan Carpenter <redacted> Reviewed-by: Tomas Henzl <redacted> Signed-off-by: Martin K. Petersen <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/scsi/arcmsr/arcmsr_hba.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c@@ -2297,7 +2297,8 @@ static int arcmsr_iop_message_xfer(struc } 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(struc } 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);
Patches currently in stable-queue which might be from dan.carpenter@oracle.com are queue-4.4/scsi-arcmsr-simplify-user_len-checking.patch queue-4.4/scsi-arcmsr-buffer-overflow-in-arcmsr_iop_message_xfer.patch