Skip to content

Commit 66acb15

Browse files
ian-abbottgregkh
authored andcommitted
comedi: aio_iiro_16: Fix bit shift out of bounds
When checking for a supported IRQ number, the following test is used: if ((1 << it->options[1]) & 0xdcfc) { However, `it->options[i]` is an unchecked `int` value from userspace, so the shift amount could be negative or out of bounds. Fix the test by requiring `it->options[1]` to be within bounds before proceeding with the original test. Valid `it->options[1]` values that select the IRQ will be in the range [1,15]. The value 0 explicitly disables the use of interrupts. Fixes: ad7a370 ("staging: comedi: aio_iiro_16: add command support for change of state detection") Cc: [email protected] # 5.13+ Signed-off-by: Ian Abbott <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent b14b076 commit 66acb15

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/comedi/drivers/aio_iiro_16.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@ static int aio_iiro_16_attach(struct comedi_device *dev,
177177
* Digital input change of state interrupts are optionally supported
178178
* using IRQ 2-7, 10-12, 14, or 15.
179179
*/
180-
if ((1 << it->options[1]) & 0xdcfc) {
180+
if (it->options[1] > 0 && it->options[1] < 16 &&
181+
(1 << it->options[1]) & 0xdcfc) {
181182
ret = request_irq(it->options[1], aio_iiro_16_cos, 0,
182183
dev->board_name, dev);
183184
if (ret == 0)

0 commit comments

Comments
 (0)