Commit 0bd0db42 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: addi_apci_1032: check INSN_CONFIG_DIGITAL_TRIG shift

The `INSN_CONFIG` comedi instruction with sub-instruction code
`INSN_CONFIG_DIGITAL_TRIG` includes a base channel in `data[3]`. This is
used as a right shift amount for other bitmask values without being
checked.  Shift amounts greater than or equal to 32 will result in
undefined behavior.  Add code to deal with this.

Fixes: 33cdce62 ("staging: comedi: addi_apci_1032: conform to new INSN_CONFIG_DIGITAL_TRIG")
Cc: <stable@vger.kernel.org> #3.8+
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Link: https://lore.kernel.org/r/20200717145257.112660-3-abbotti@mev.co.ukSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f07804ec
...@@ -106,14 +106,22 @@ static int apci1032_cos_insn_config(struct comedi_device *dev, ...@@ -106,14 +106,22 @@ static int apci1032_cos_insn_config(struct comedi_device *dev,
unsigned int *data) unsigned int *data)
{ {
struct apci1032_private *devpriv = dev->private; struct apci1032_private *devpriv = dev->private;
unsigned int shift, oldmask; unsigned int shift, oldmask, himask, lomask;
switch (data[0]) { switch (data[0]) {
case INSN_CONFIG_DIGITAL_TRIG: case INSN_CONFIG_DIGITAL_TRIG:
if (data[1] != 0) if (data[1] != 0)
return -EINVAL; return -EINVAL;
shift = data[3]; shift = data[3];
oldmask = (1U << shift) - 1; if (shift < 32) {
oldmask = (1U << shift) - 1;
himask = data[4] << shift;
lomask = data[5] << shift;
} else {
oldmask = 0xffffffffu;
himask = 0;
lomask = 0;
}
switch (data[2]) { switch (data[2]) {
case COMEDI_DIGITAL_TRIG_DISABLE: case COMEDI_DIGITAL_TRIG_DISABLE:
devpriv->ctrl = 0; devpriv->ctrl = 0;
...@@ -136,8 +144,8 @@ static int apci1032_cos_insn_config(struct comedi_device *dev, ...@@ -136,8 +144,8 @@ static int apci1032_cos_insn_config(struct comedi_device *dev,
devpriv->mode2 &= oldmask; devpriv->mode2 &= oldmask;
} }
/* configure specified channels */ /* configure specified channels */
devpriv->mode1 |= data[4] << shift; devpriv->mode1 |= himask;
devpriv->mode2 |= data[5] << shift; devpriv->mode2 |= lomask;
break; break;
case COMEDI_DIGITAL_TRIG_ENABLE_LEVELS: case COMEDI_DIGITAL_TRIG_ENABLE_LEVELS:
if (devpriv->ctrl != (APCI1032_CTRL_INT_ENA | if (devpriv->ctrl != (APCI1032_CTRL_INT_ENA |
...@@ -154,8 +162,8 @@ static int apci1032_cos_insn_config(struct comedi_device *dev, ...@@ -154,8 +162,8 @@ static int apci1032_cos_insn_config(struct comedi_device *dev,
devpriv->mode2 &= oldmask; devpriv->mode2 &= oldmask;
} }
/* configure specified channels */ /* configure specified channels */
devpriv->mode1 |= data[4] << shift; devpriv->mode1 |= himask;
devpriv->mode2 |= data[5] << shift; devpriv->mode2 |= lomask;
break; break;
default: default:
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment