Skip to content

Commit b14b076

Browse files
ian-abbottgregkh
authored andcommitted
comedi: pcl812: Fix bit shift out of bounds
When checking for a supported IRQ number, the following test is used: if ((1 << it->options[1]) & board->irq_bits) { 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. Reported-by: [email protected] Closes: https://syzkaller.appspot.com/bug?extid=32de323b0addb9e114ff Fixes: fcdb427 ("Staging: comedi: add pcl821 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 ed93c6f commit b14b076

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/comedi/drivers/pcl812.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,8 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
11491149
if (IS_ERR(dev->pacer))
11501150
return PTR_ERR(dev->pacer);
11511151

1152-
if ((1 << it->options[1]) & board->irq_bits) {
1152+
if (it->options[1] > 0 && it->options[1] < 16 &&
1153+
(1 << it->options[1]) & board->irq_bits) {
11531154
ret = request_irq(it->options[1], pcl812_interrupt, 0,
11541155
dev->board_name, dev);
11551156
if (ret == 0)

0 commit comments

Comments
 (0)