Skip to content

Commit 8a5752c

Browse files
avasummerPaolo Abeni
authored andcommitted
dpaa2-switch: validate num_ifs to prevent out-of-bounds write
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: 539dda3 ("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>
1 parent 7aa767d commit 8a5752c

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3034,6 +3034,13 @@ static int dpaa2_switch_init(struct fsl_mc_device *sw_dev)
30343034
goto err_close;
30353035
}
30363036

3037+
if (ethsw->sw_attr.num_ifs >= DPSW_MAX_IF) {
3038+
dev_err(dev, "DPSW num_ifs %u exceeds max %u\n",
3039+
ethsw->sw_attr.num_ifs, DPSW_MAX_IF);
3040+
err = -EINVAL;
3041+
goto err_close;
3042+
}
3043+
30373044
err = dpsw_get_api_version(ethsw->mc_io, 0,
30383045
&ethsw->major,
30393046
&ethsw->minor);

0 commit comments

Comments
 (0)