]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
dpaa2-switch: add bounds check for if_id in IRQ handler
authorJunrui Luo <moonafterrain@outlook.com>
Wed, 28 Jan 2026 16:55:13 +0000 (00:55 +0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 30 Jan 2026 03:40:51 +0000 (19:40 -0800)
The IRQ handler extracts if_id from the upper 16 bits of the hardware
status register and uses it to index into ethsw->ports[] without
validation. Since if_id can be any 16-bit value (0-65535) but the ports
array is only allocated with sw_attr.num_ifs elements, this can lead to
an out-of-bounds read potentially.

Add a bounds check before accessing the array, consistent with the
existing validation in dpaa2_switch_rx().

Reported-by: Yuhao Jiang <danisjiang@gmail.com>
Reported-by: Junrui Luo <moonafterrain@outlook.com>
Fixes: 24ab724f8a46 ("dpaa2-switch: use the port index in the IRQ handler")
Signed-off-by: Junrui Luo <moonafterrain@outlook.com>
Link: https://patch.msgid.link/SYBPR01MB7881D420AB43FF1A227B84AFAF91A@SYBPR01MB7881.ausprd01.prod.outlook.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c

index 0ff234f6a3ed972eba52812af0180bbeeb0714c2..66240c340492ce68f2c7c78efd7b8fe58d5e33b8 100644 (file)
@@ -1531,6 +1531,10 @@ static irqreturn_t dpaa2_switch_irq0_handler_thread(int irq_num, void *arg)
        }
 
        if_id = (status & 0xFFFF0000) >> 16;
+       if (if_id >= ethsw->sw_attr.num_ifs) {
+               dev_err(dev, "Invalid if_id %d in IRQ status\n", if_id);
+               goto out;
+       }
        port_priv = ethsw->ports[if_id];
 
        if (status & DPSW_IRQ_EVENT_LINK_CHANGED)