Skip to content

Commit

Permalink
staging: comedi: quatech_daqp_cs: fix possible memory dereference issue
Browse files Browse the repository at this point in the history
In daqp_attach(), the first options value passed in the comedi_devconfig
is used as an index to the private dev_table[] in this driver. This table
is used to pass the pcmcia_device to the comedi_driver.

Fix the code so that the index is checked before the table is accessed
so that we don't get a possible memory dereference BUG.

Change the error returned to the comedi core from -EIO to -ENODEV.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jan 30, 2013
1 parent e23fe9a commit c65c64d
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/staging/comedi/drivers/quatech_daqp_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -733,15 +733,16 @@ static int daqp_do_insn_write(struct comedi_device *dev,

static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
int ret;
struct local_info_t *local = dev_table[it->options[0]];
struct local_info_t *local;
struct comedi_subdevice *s;
int ret;

if (it->options[0] < 0 || it->options[0] >= MAX_DEV || !local) {
dev_err(dev->class_dev, "No such daqp device %d\n",
it->options[0]);
return -EIO;
}
if (it->options[0] < 0 || it->options[0] >= MAX_DEV)
return -ENODEV;

local = dev_table[it->options[0]];
if (!local)
return -ENODEV;

/* Typically brittle code that I don't completely understand,
* but "it works on my card". The intent is to pull the model
Expand Down

0 comments on commit c65c64d

Please sign in to comment.