From: Philipp Hahn <hahn@univention.de>
To: Sasha Levin <alexander.levin@verizon.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>,
<stable@vger.kernel.org>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Philipp Hahn <hahn@univention.de>
Subject: [PATCH 10/16] scsi: arcmsr: Buffer overflow in arcmsr_iop_message_xfer()
Date: Wed, 14 Dec 2016 13:24:52 +0100 [thread overview]
Message-ID: <97b02a4e85d3b3930d24bd157db8e5e8672e55ab.1481713714.git.hahn@univention.de> (raw)
In-Reply-To: <cover.1481713714.git.hahn@univention.de>
In-Reply-To: <cover.1481713714.git.hahn@univention.de>
From: Dan Carpenter <dan.carpenter@oracle.com>
[ Upstream commit 7bc2b55a5c030685b399bb65b6baa9ccc3d1f167 ]
We need to put an upper bound on "user_len" so the memcpy() doesn't
overflow.
References: CVE-2016-7425
Cc: <stable@vger.kernel.org>
Reported-by: Marco Grassi <marco.gra@gmail.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Philipp Hahn <hahn@univention.de>
---
drivers/scsi/arcmsr/arcmsr_hba.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index 2926295..c9f87cd 100644
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -2300,7 +2300,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) {
@@ -2309,6 +2310,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);
--
2.1.4
next parent reply other threads:[~2016-12-14 12:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1481713714.git.hahn@univention.de>
2016-12-14 12:24 ` Philipp Hahn [this message]
2016-12-14 16:46 ` [PATCH 10/16] scsi: arcmsr: Buffer overflow in arcmsr_iop_message_xfer() Greg KH
2016-12-15 5:13 ` Philipp Hahn
2016-12-15 11:45 ` Greg KH
2016-12-14 12:24 ` [PATCH 15/16] net: ping: check minimum size on ICMP header length Philipp Hahn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=97b02a4e85d3b3930d24bd157db8e5e8672e55ab.1481713714.git.hahn@univention.de \
--to=hahn@univention.de \
--cc=alexander.levin@verizon.com \
--cc=dan.carpenter@oracle.com \
--cc=martin.petersen@oracle.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.