From: Dan Carpenter <dan.carpenter@oracle.com>
To: Adaptec OEM Raid Solutions <aacraid@microsemi.com>
Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
linux-scsi@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH 1/2] scsi: aacraid: reading out of bounds
Date: Tue, 25 Jul 2017 19:49:55 +0000 [thread overview]
Message-ID: <20170725194955.dd4g6msevoesty4t@mwanda> (raw)
"qd.id" comes directly from the copy_from_user() on the line before so
we should verify that it's within bounds.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
This bug predates git.
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 707ee2f5954d..4591113c49de 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -3198,10 +3198,11 @@ static int query_disk(struct aac_dev *dev, void __user *arg)
return -EBUSY;
if (copy_from_user(&qd, arg, sizeof (struct aac_query_disk)))
return -EFAULT;
- if (qd.cnum = -1)
+ if (qd.cnum = -1) {
+ if (qd.id < 0 || qd.id >= dev->maximum_num_containers)
+ return -EINVAL;
qd.cnum = qd.id;
- else if ((qd.bus = -1) && (qd.id = -1) && (qd.lun = -1))
- {
+ } else if ((qd.bus = -1) && (qd.id = -1) && (qd.lun = -1)) {
if (qd.cnum < 0 || qd.cnum >= dev->maximum_num_containers)
return -EINVAL;
qd.instance = dev->scsi_host_ptr->host_no;
next reply other threads:[~2017-07-25 19:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-25 19:49 Dan Carpenter [this message]
2017-07-25 19:51 ` [PATCH 2/2] scsi: aacraid: Off by one NUL terminator Dan Carpenter
2017-07-25 21:19 ` Bart Van Assche
2017-07-27 3:08 ` Martin K. Petersen
2017-07-27 9:00 ` Dan Carpenter
2017-07-27 12:55 ` Martin K. Petersen
2017-07-27 16:26 ` Dave Carroll
2017-07-27 16:30 ` Martin K. Petersen
2017-07-27 16:51 ` Dave Carroll
2017-07-27 2:10 ` [PATCH 1/2] scsi: aacraid: reading out of bounds Martin K. Petersen
2017-07-27 16:12 ` Dave Carroll
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=20170725194955.dd4g6msevoesty4t@mwanda \
--to=dan.carpenter@oracle.com \
--cc=aacraid@microsemi.com \
--cc=jejb@linux.vnet.ibm.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/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