Patch "scsi: arcmsr: Simplify user_len checking" has been added to the 4.8-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
scsi: arcmsr: Simplify user_len checking
to the 4.8-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-simplify-user_len-checking.patch
and it can be found in the queue-4.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
4bd173c30792791a6daca8c64793ec0a4ae8324fMon Sep 17 00:00:00 2001
From: Borislav Petkov <[email protected]>
Date: Fri, 23 Sep 2016 13:22:26 +0200
Subject: scsi: arcmsr: Simplify user_len checking
From: Borislav Petkov <[email protected]>
commit 4bd173c30792791a6daca8c64793ec0a4ae8324f 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.
--- drivers/scsi/arcmsr/arcmsr_hba.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/scsi/arcmsr/arcmsr_hba.c +8 -6
@@ -2391,18 +2391,20 @@ static int arcmsr_iop_message_xfer(strucuint32_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);
Patches currently in stable-queue which might be from [email protected] are
queue-4.8/scsi-arcmsr-simplify-user_len-checking.patch