From: Peter Huewe <peterhuewe@gmx.de>
To: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
H Hartley Sweeten <hsweeten@visionengravers.com>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Peter Huewe <peterhuewe@gmx.de>
Subject: [PATCH v2] staging/comedi: Fix undefined array subscript
Date: Wed, 13 Feb 2013 15:28:14 +0100 [thread overview]
Message-ID: <1360765694-3748-1-git-send-email-peterhuewe@gmx.de> (raw)
In-Reply-To: <20130213140147.GA4606@mwanda>
In vmk80xx_do_insn_bits the local variable reg, which is used as an
index to the tx_buf array, can be used uninitialized if
- data[0] == 0
and
- devpriv->model != VMK8061_MODEL
-> we get into the else branch without having reg initialized.
Since the driver usually differentiates between VMK8061_MODEL and
VMK8055_MODEL it's safe to assume that VMK8055_DO_REG was meant as an
initial value.
And to avoid duplication we can move the assignments to the top.
Acked-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
---
drivers/staging/comedi/drivers/vmk80xx.c | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
index ebf2d48..eed46ee 100644
--- a/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/drivers/staging/comedi/drivers/vmk80xx.c
@@ -675,8 +675,14 @@ static int vmk80xx_do_insn_bits(struct comedi_device *dev,
if (data[0])
dir |= DIR_OUT;
- if (devpriv->model == VMK8061_MODEL)
+ if (devpriv->model == VMK8061_MODEL) {
dir |= DIR_IN;
+ reg = VMK8061_DO_REG;
+ cmd = VMK8061_CMD_DO;
+ } else { /* VMK8055_MODEL */
+ reg = VMK8055_DO_REG;
+ cmd = VMK8055_CMD_WRT_AD;
+ }
retval = rudimentary_check(devpriv, dir);
if (retval)
@@ -688,14 +694,6 @@ static int vmk80xx_do_insn_bits(struct comedi_device *dev,
tx_buf = devpriv->usb_tx_buf;
if (data[0]) {
- if (devpriv->model == VMK8055_MODEL) {
- reg = VMK8055_DO_REG;
- cmd = VMK8055_CMD_WRT_AD;
- } else { /* VMK8061_MODEL */
- reg = VMK8061_DO_REG;
- cmd = VMK8061_CMD_DO;
- }
-
tx_buf[reg] &= ~data[0];
tx_buf[reg] |= (data[0] & data[1]);
@@ -706,7 +704,6 @@ static int vmk80xx_do_insn_bits(struct comedi_device *dev,
}
if (devpriv->model == VMK8061_MODEL) {
- reg = VMK8061_DO_REG;
tx_buf[0] = VMK8061_CMD_RD_DO;
retval = vmk80xx_read_packet(devpriv);
--
1.7.8.6
next prev parent reply other threads:[~2013-02-13 14:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-13 3:30 [PATCH] staging/comedi: Fix undefined array subscript Peter Huewe
2013-02-13 7:32 ` Dan Carpenter
2013-02-13 11:56 ` Ian Abbott
2013-02-13 13:47 ` Ian Abbott
2013-02-13 14:01 ` Dan Carpenter
2013-02-13 14:28 ` Peter Huewe [this message]
2013-02-13 14:58 ` [PATCH v2] " Dan Carpenter
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=1360765694-3748-1-git-send-email-peterhuewe@gmx.de \
--to=peterhuewe@gmx.de \
--cc=abbotti@mev.co.uk \
--cc=devel@driverdev.osuosl.org \
--cc=fmhess@users.sourceforge.net \
--cc=gregkh@linuxfoundation.org \
--cc=hsweeten@visionengravers.com \
--cc=linux-kernel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).