Skip to content

Commit 70f2b28

Browse files
ian-abbottgregkh
authored andcommitted
comedi: das6402: Fix bit shift out of bounds
When checking for a supported IRQ number, the following test is used: /* IRQs 2,3,5,6,7, 10,11,15 are valid for "enhanced" mode */ if ((1 << it->options[1]) & 0x8cec) { 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: 79e5e6a ("staging: comedi: das6402: rewrite broken driver") 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 66acb15 commit 70f2b28

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/comedi/drivers/das6402.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,8 @@ static int das6402_attach(struct comedi_device *dev,
567567
das6402_reset(dev);
568568

569569
/* IRQs 2,3,5,6,7, 10,11,15 are valid for "enhanced" mode */
570-
if ((1 << it->options[1]) & 0x8cec) {
570+
if (it->options[1] > 0 && it->options[1] < 16 &&
571+
(1 << it->options[1]) & 0x8cec) {
571572
ret = request_irq(it->options[1], das6402_interrupt, 0,
572573
dev->board_name, dev);
573574
if (ret == 0) {

0 commit comments

Comments
 (0)