]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
comedi: pcl726: Prevent invalid irq number
authorEdward Adam Davis <eadavis@qq.com>
Mon, 7 Jul 2025 12:39:58 +0000 (20:39 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 19 Aug 2025 10:56:16 +0000 (12:56 +0200)
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: fff46207245c ("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>
drivers/comedi/drivers/pcl726.c

index 0430630e6ebb9034a8e576ff61bee1ba877b9718..b542896fa0e42777330042dba77bda839ae932ef 100644 (file)
@@ -328,7 +328,8 @@ static int pcl726_attach(struct comedi_device *dev,
         * Hook up the external trigger source interrupt only if the
         * user config option is valid and the board supports interrupts.
         */
-       if (it->options[1] && (board->irq_mask & (1 << it->options[1]))) {
+       if (it->options[1] > 0 && it->options[1] < 16 &&
+           (board->irq_mask & (1U << it->options[1]))) {
                ret = request_irq(it->options[1], pcl726_interrupt, 0,
                                  dev->board_name, dev);
                if (ret == 0) {