]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
dpaa2-switch: validate num_ifs to prevent out-of-bounds write
authorJunrui Luo <moonafterrain@outlook.com>
Tue, 24 Feb 2026 11:05:56 +0000 (19:05 +0800)
committerPaolo Abeni <pabeni@redhat.com>
Thu, 26 Feb 2026 11:37:21 +0000 (12:37 +0100)
The driver obtains sw_attr.num_ifs from firmware via dpsw_get_attributes()
but never validates it against DPSW_MAX_IF (64). This value controls
iteration in dpaa2_switch_fdb_get_flood_cfg(), which writes port indices
into the fixed-size cfg->if_id[DPSW_MAX_IF] array. When firmware reports
num_ifs >= 64, the loop can write past the array bounds.

Add a bound check for num_ifs in dpaa2_switch_init().

dpaa2_switch_fdb_get_flood_cfg() appends the control interface (port
num_ifs) after all matched ports. When num_ifs == DPSW_MAX_IF and all
ports match the flood filter, the loop fills all 64 slots and the control
interface write overflows by one entry.

The check uses >= because num_ifs == DPSW_MAX_IF is also functionally
broken.

build_if_id_bitmap() silently drops any ID >= 64:
      if (id[i] < DPSW_MAX_IF)
          bmap[id[i] / 64] |= ...

Fixes: 539dda3c5d19 ("staging: dpaa2-switch: properly setup switching domains")
Signed-off-by: Junrui Luo <moonafterrain@outlook.com>
Reviewed-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Link: https://patch.msgid.link/SYBPR01MB78812B47B7F0470B617C408AAF74A@SYBPR01MB7881.ausprd01.prod.outlook.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c

index 66240c340492ce68f2c7c78efd7b8fe58d5e33b8..78e21b46a5ba8178b640c3e998606fd6c38c2d3c 100644 (file)
@@ -3034,6 +3034,13 @@ static int dpaa2_switch_init(struct fsl_mc_device *sw_dev)
                goto err_close;
        }
 
+       if (ethsw->sw_attr.num_ifs >= DPSW_MAX_IF) {
+               dev_err(dev, "DPSW num_ifs %u exceeds max %u\n",
+                       ethsw->sw_attr.num_ifs, DPSW_MAX_IF);
+               err = -EINVAL;
+               goto err_close;
+       }
+
        err = dpsw_get_api_version(ethsw->mc_io, 0,
                                   &ethsw->major,
                                   &ethsw->minor);