]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
staging: comedi: addi_apci_1032: check INSN_CONFIG_DIGITAL_TRIG shift
authorIan Abbott <abbotti@mev.co.uk>
Fri, 17 Jul 2020 14:52:55 +0000 (15:52 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Jul 2020 08:19:56 +0000 (10:19 +0200)
commit06e6dcc27e99c1bbbc2341786a6c001fb602967d
treeb29fb3ea50a5632abf70e860905381c03fe670ac
parent6d56f193849a13d9a3b68eb93fb3205b8b3b28d8
staging: comedi: addi_apci_1032: check INSN_CONFIG_DIGITAL_TRIG shift

commit 0bd0db42a030b75c20028c7ba6e327b9cb554116 upstream.

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: 33cdce6293dcc ("staging: comedi: addi_apci_1032: conform to new INSN_CONFIG_DIGITAL_TRIG")
Cc: <stable@vger.kernel.org> #3.8+
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Link: https://lore.kernel.org/r/20200717145257.112660-3-abbotti@mev.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/addi_apci_1032.c