public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Neela Syam Kolli <megaraidlinux@lsi.com>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>,
	linux-scsi@vger.kernel.org, security@kernel.org,
	Nico Golde <nico@ngolde.de>, Fabian Yamaguchi <fabs@goesec.de>
Subject: [patch] [SCSI] megaraid: missing bounds check in mimd_to_kioc()
Date: Wed, 30 Oct 2013 20:13:51 +0300	[thread overview]
Message-ID: <20131030171351.GB4130@longonot.mountain> (raw)
In-Reply-To: <20131025144452.GA28451@ngolde.de>

pthru32->dataxferlen comes from the user so we need to check that it's
not too large so we don't overflow the buffer.

Reported-by: Nico Golde <nico@ngolde.de>
Reported-by: Fabian Yamaguchi <fabs@goesec.de>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
Please review this carefully because I have not tested it.

diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index dfffd0f..a706927 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -486,6 +486,8 @@ mimd_to_kioc(mimd_t __user *umimd, mraid_mmadp_t *adp, uioc_t *kioc)
 
 	pthru32->dataxferaddr	= kioc->buf_paddr;
 	if (kioc->data_dir & UIOC_WR) {
+		if (pthru32->dataxferlen > kioc->xferlen)
+			return -EINVAL;
 		if (copy_from_user(kioc->buf_vaddr, kioc->user_data,
 						pthru32->dataxferlen)) {
 			return (-EFAULT);

  parent reply	other threads:[~2013-10-30 17:17 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20131025144452.GA28451@ngolde.de>
2013-10-29 19:10 ` [patch] [SCSI] aacraid: prevent ZERO_SIZE_PTR dereference Dan Carpenter
2013-10-29 19:36   ` James Bottomley
2013-10-29 19:59   ` Linus Torvalds
2013-10-29 20:06     ` Dan Carpenter
2013-10-29 20:17       ` Linus Torvalds
2013-10-30  7:47   ` Dan Carpenter
2013-10-29 19:11 ` [patch] [SCSI] aacraid: missing capable() check in compat ioctl Dan Carpenter
2013-10-30 17:13 ` Dan Carpenter [this message]
2013-11-21  0:40   ` [patch] [SCSI] megaraid: missing bounds check in mimd_to_kioc() Kees Cook
2014-01-08 12:27   ` Saxena, Sumit
2014-01-09 18:34     ` Kees Cook
2014-01-09 19:53       ` Saxena, Sumit
2014-01-09 20:03         ` Kees Cook

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=20131030171351.GB4130@longonot.mountain \
    --to=dan.carpenter@oracle.com \
    --cc=JBottomley@parallels.com \
    --cc=fabs@goesec.de \
    --cc=linux-scsi@vger.kernel.org \
    --cc=megaraidlinux@lsi.com \
    --cc=nico@ngolde.de \
    --cc=security@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox