Skip to content

Commit

Permalink
staging: comedi: check s->async for poll(), read() and write()
Browse files Browse the repository at this point in the history
commit cc400e1 upstream.

Some low-level comedi drivers (incorrectly) point `dev->read_subdev` or
`dev->write_subdev` to a subdevice that does not support asynchronous
commands.  Comedi's poll(), read() and write() file operation handlers
assume these subdevices do support asynchronous commands.  In
particular, they assume `s->async` is valid (where `s` points to the
read or write subdevice), which it won't be if it has been set
incorrectly.  This can lead to a NULL pointer dereference.

Check `s->async` is non-NULL in `comedi_poll()`, `comedi_read()` and
`comedi_write()` to avoid the bug.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Mar 3, 2013
1 parent 544da44 commit 6c80ee5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/comedi/comedi_fops.c
Original file line number Diff line number Diff line change
Expand Up @@ -1577,7 +1577,7 @@ static unsigned int comedi_poll(struct file *file, poll_table * wait)

mask = 0;
read_subdev = comedi_get_read_subdevice(dev_file_info);
if (read_subdev) {
if (read_subdev && read_subdev->async) {
poll_wait(file, &read_subdev->async->wait_head, wait);
if (!read_subdev->busy
|| comedi_buf_read_n_available(read_subdev->async) > 0
Expand All @@ -1587,7 +1587,7 @@ static unsigned int comedi_poll(struct file *file, poll_table * wait)
}
}
write_subdev = comedi_get_write_subdevice(dev_file_info);
if (write_subdev) {
if (write_subdev && write_subdev->async) {
poll_wait(file, &write_subdev->async->wait_head, wait);
comedi_buf_write_alloc(write_subdev->async,
write_subdev->async->prealloc_bufsz);
Expand Down Expand Up @@ -1629,7 +1629,7 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
}

s = comedi_get_write_subdevice(dev_file_info);
if (s == NULL) {
if (s == NULL || s->async == NULL) {
retval = -EIO;
goto done;
}
Expand Down Expand Up @@ -1740,7 +1740,7 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes,
}

s = comedi_get_read_subdevice(dev_file_info);
if (s == NULL) {
if (s == NULL || s->async == NULL) {
retval = -EIO;
goto done;
}
Expand Down

0 comments on commit 6c80ee5

Please sign in to comment.