diff options
| author | H Hartley Sweeten | 2014-09-10 01:15:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-09-11 23:35:21 +0200 |
| commit | fd6887b2ec985f7fcc42b48caa6561ed98cbf720 (patch) | |
| tree | b30894b640de6a89645cc025cd9187f117182881 /drivers/staging/comedi | |
| parent | staging: comedi: me4000: validate cmd->stop_arg in step 3 of (*do_cmdtest) (diff) | |
| download | kernel-qcow2-linux-fd6887b2ec985f7fcc42b48caa6561ed98cbf720.tar.gz kernel-qcow2-linux-fd6887b2ec985f7fcc42b48caa6561ed98cbf720.tar.xz kernel-qcow2-linux-fd6887b2ec985f7fcc42b48caa6561ed98cbf720.zip | |
staging: comedi: ni_atmio16d: prevent "empty acquisition" async command
This driver currently allows a cmd->stop_src == TRIG_COUNT with a cmd->stop_arg
of 0. The (*do_cmd) then sets up and starts the command without handling the "empty
acquisition". This results in the interrupt function trying to transfer 0 data
samples.
Validate that the cmd->stop_arg is >= 1 in the (*do_cmdtest) to prevent the
"empty acquisition".
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_atmio16d.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/ni_atmio16d.c b/drivers/staging/comedi/drivers/ni_atmio16d.c index be541e5dc47b..fc3c19de7005 100644 --- a/drivers/staging/comedi/drivers/ni_atmio16d.c +++ b/drivers/staging/comedi/drivers/ni_atmio16d.c @@ -274,11 +274,10 @@ static int atmio16d_ai_cmdtest(struct comedi_device *dev, err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len); - if (cmd->stop_src == TRIG_COUNT) { - /* any count is allowed */ - } else { /* TRIG_NONE */ + if (cmd->stop_src == TRIG_COUNT) + err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1); + else /* TRIG_NONE */ err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0); - } if (err) return 3; |