public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH net] dpaa2-switch: validate num_ifs to prevent out-of-bounds write
@ 2026-02-17 14:42 Junrui Luo
  2026-02-19 22:14 ` Jakub Kicinski
  0 siblings, 1 reply; 3+ messages in thread
From: Junrui Luo @ 2026-02-17 14:42 UTC (permalink / raw)
  To: Ioana Ciornei, Andrew Lunn, David S. Miller, Eric Dumazet,
	Jakub Kicinski, Paolo Abeni
  Cc: netdev, linux-kernel, Yuhao Jiang, Junrui Luo

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().

Reported-by: Yuhao Jiang <danisjiang@gmail.com>
Reported-by: Junrui Luo <moonafterrain@outlook.com>
Fixes: f054e3e217e4 ("dpaa2-switch: refactor the egress flooding domain setup")
Signed-off-by: Junrui Luo <moonafterrain@outlook.com>
---
 drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
index 66240c340492..78e21b46a5ba 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
@@ -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);

---
base-commit: 9702969978695d9a699a1f34771580cdbb153b33
change-id: 20260217-fixes-32df5449b0ab

Best regards,
-- 
Junrui Luo <moonafterrain@outlook.com>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH net] dpaa2-switch: validate num_ifs to prevent out-of-bounds write
  2026-02-17 14:42 [PATCH net] dpaa2-switch: validate num_ifs to prevent out-of-bounds write Junrui Luo
@ 2026-02-19 22:14 ` Jakub Kicinski
  0 siblings, 0 replies; 3+ messages in thread
From: Jakub Kicinski @ 2026-02-19 22:14 UTC (permalink / raw)
  To: Junrui Luo
  Cc: Ioana Ciornei, Andrew Lunn, David S. Miller, Eric Dumazet,
	Paolo Abeni, netdev, linux-kernel, Yuhao Jiang

On Tue, 17 Feb 2026 22:42:40 +0800 Junrui Luo wrote:
> 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().
> 
> Reported-by: Yuhao Jiang <danisjiang@gmail.com>
> Reported-by: Junrui Luo <moonafterrain@outlook.com>

Please remove the self-referential reported-by tags. FWIW:
https://github.com/google/security-research/pull/334

> Fixes: f054e3e217e4 ("dpaa2-switch: refactor the egress flooding domain setup")

This commit looks like refactoring.
Please dig a bit deeper to find the real commit in which the bug was
added.

> Signed-off-by: Junrui Luo <moonafterrain@outlook.com>

> diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
> index 66240c340492..78e21b46a5ba 100644
> --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
> +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
> @@ -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) {

Unclear to me from a quick look at the code and the commit message why
we reject num_ifs == DPSW_MAX_IF. I see there are some references to a
control interface in egress flooding, is that why?

Please explain clearly.
-- 
pw-bot: cr

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH net] dpaa2-switch: validate num_ifs to prevent out-of-bounds write
@ 2026-02-23  8:20 Junrui Luo
  0 siblings, 0 replies; 3+ messages in thread
From: Junrui Luo @ 2026-02-23  8:20 UTC (permalink / raw)
  To: Jakub Kicinski
  Cc: Junrui Luo, Ioana Ciornei, Andrew Lunn, David S. Miller,
	Eric Dumazet, Paolo Abeni, netdev@vger.kernel.org, LKML,
	Yuhao Jiang

On Thu, Feb 19, 2026 at 02:14:07PM -0800, Jakub Kicinski wrote:
> > Reported-by: Yuhao Jiang <danisjiang@gmail.com>
> > Reported-by: Junrui Luo <moonafterrain@outlook.com>
> 
> Please remove the self-referential reported-by tags. FWIW:
> https://github.com/google/security-research/pull/334

Will drop in v2.

> 
> > Fixes: f054e3e217e4 ("dpaa2-switch: refactor the egress flooding domain setup")
> 
> This commit looks like refactoring.
> Please dig a bit deeper to find the real commit in which the bug was
> added.

I found the actual vulnerable pattern was introduced in:

539dda3c5d19 ("staging: dpaa2-switch: properly setup switching domains")

Will fix in v2.

> > +	if (ethsw->sw_attr.num_ifs >= DPSW_MAX_IF) {
> 
> Unclear to me from a quick look at the code and the commit message why
> we reject num_ifs == DPSW_MAX_IF. I see there are some references to a
> control interface in egress flooding, is that why?
> 
> Please explain clearly.

dpaa2_switch_fdb_get_flood_cfg() appends the control
interface entry after all matched ports:

      for (j = 0; j < ethsw->sw_attr.num_ifs; j++)
          if (port matches)
              cfg->if_id[i++] = ethsw->ports[j]->idx;

      cfg->if_id[i++] = ethsw->sw_attr.num_ifs;

When num_ifs == 64 and all ports match the flood filter, the loop
fills all 64 slots (indices 0-63), then the control interface write
goes to cfg->if_id[64].

Beyond the array overflow, num_ifs == 64 is also functionally broken:
build_if_id_bitmap() silently drops any ID >= 64:

      if (id[i] < DPSW_MAX_IF)
          bmap[id[i] / 64] |= ...

Will clarify this in the v2 commit message.

Thanks,
Junrui Luo

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2026-02-23  8:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-17 14:42 [PATCH net] dpaa2-switch: validate num_ifs to prevent out-of-bounds write Junrui Luo
2026-02-19 22:14 ` Jakub Kicinski
  -- strict thread matches above, loose matches on Subject: below --
2026-02-23  8:20 Junrui Luo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox