Skip to content

Commit d8992c9

Browse files
ea1davisgregkh
authored andcommitted
comedi: pcl726: Prevent invalid irq number
commit 96cb948 upstream. The reproducer passed in an irq number(0x80008000) that was too large, which triggered the oob. Added an interrupt number check to prevent users from passing in an irq number that was too large. If `it->options[1]` is 31, then `1 << it->options[1]` is still invalid because it shifts a 1-bit into the sign bit (which is UB in C). Possible solutions include reducing the upper bound on the `it->options[1]` value to 30 or lower, or using `1U << it->options[1]`. The old code would just not attempt to request the IRQ if the `options[1]` value were invalid. And it would still configure the device without interrupts even if the call to `request_irq` returned an error. So it would be better to combine this test with the test below. Fixes: fff4620 ("staging: comedi: pcl726: enable the interrupt support code") Cc: stable <stable@kernel.org> # 5.13+ Reported-by: syzbot+5cd373521edd68bebcb3@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=5cd373521edd68bebcb3 Tested-by: syzbot+5cd373521edd68bebcb3@syzkaller.appspotmail.com Signed-off-by: Edward Adam Davis <eadavis@qq.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Link: https://lore.kernel.org/r/tencent_3C66983CC1369E962436264A50759176BF09@qq.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent dc0a2f1 commit d8992c9

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/comedi/drivers/pcl726.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,8 @@ static int pcl726_attach(struct comedi_device *dev,
328328
* Hook up the external trigger source interrupt only if the
329329
* user config option is valid and the board supports interrupts.
330330
*/
331-
if (it->options[1] && (board->irq_mask & (1 << it->options[1]))) {
331+
if (it->options[1] > 0 && it->options[1] < 16 &&
332+
(board->irq_mask & (1U << it->options[1]))) {
332333
ret = request_irq(it->options[1], pcl726_interrupt, 0,
333334
dev->board_name, dev);
334335
if (ret == 0) {

0 commit comments

Comments
 (0)