Commit c5d9973b authored Sep 09, 2014 by H Hartley Sweeten Committed by Greg Kroah-Hartman Sep 11, 2014

staging: comedi: cb_pcidas: prevent "empty acquisition" async commands



This driver currently allows a cmd->stop_src == TRIG_COUNT with a cmd->stop_arg
of 0 for both the analog input and output async commands. The (*do_cmd) for
both subdevices sets up and starts the command without handling the "empty
acquisition". This results in the interrupt functions 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>

parent 1dabb501

drivers/staging/comedi/drivers/cb_pcidas.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -886,7 +886,9 @@ static int cb_pcidas_ai_cmdtest(struct comedi_device *dev,

		err \|= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);

		if (cmd->stop_src == 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)
		@@ -1079,7 +1081,9 @@ static int cb_pcidas_ao_cmdtest(struct comedi_device *dev,

		err \|= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);

		if (cmd->stop_src == 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)