mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jerry Wu <w.7erry@foxmail.com>
To: vladimir.oltean@nxp.com
Cc: linux-kernel@vger.kernel.org, Jerry Wu <w.7erry@foxmail.com>
Subject: [PATCH] Prevent crash when adding interface under a lag
Date: Sat, 20 Dec 2025 17:32:15 +0000	[thread overview]
Message-ID: <tencent_9E2B81D645D04DFE191C86F128212F842B05@qq.com> (raw)

Commit 15faa1f67ab4 ("lan966x: Fix crash when adding interface under a lag")
had fixed CVE-2024-26723 which is caused by NULL pointer dereference.
ocelot_set_aggr_pgids in drivers/net/ethernet/mscc/ocelot.c contains a similar logic.
This patch fix it in the same way as the aforementioned patch did.

Signed-off-by: Jerry Wu <w.7erry@foxmail.com>
---
 drivers/net/ethernet/mscc/ocelot.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index 08bee56aea35..cb1c19c38c2c 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -2307,19 +2307,24 @@ static void ocelot_set_aggr_pgids(struct ocelot *ocelot)
 
 	/* Now, set PGIDs for each active LAG */
 	for (lag = 0; lag < ocelot->num_phys_ports; lag++) {
-		struct net_device *bond = ocelot->ports[lag]->bond;
+		struct ocelot_port *port = ocelot->ports[lag];
 		int num_active_ports = 0;
+		struct net_device *bond;
 		unsigned long bond_mask;
 		u8 aggr_idx[16];
 
-		if (!bond || (visited & BIT(lag)))
+		if (!port || !port->bond || (visited & BIT(lag)))
 			continue;
 
+		bond = port->bond;
 		bond_mask = ocelot_get_bond_mask(ocelot, bond);
 
 		for_each_set_bit(port, &bond_mask, ocelot->num_phys_ports) {
 			struct ocelot_port *ocelot_port = ocelot->ports[port];
 
+			if (!port)
+				continue;
+
 			// Destination mask
 			ocelot_write_rix(ocelot, bond_mask,
 					 ANA_PGID_PGID, port);
-- 
2.51.0


             reply	other threads:[~2025-12-20 17:33 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-12-20 17:32 Jerry Wu [this message]
2025-12-20 17:57 ` Vladimir Oltean
2025-12-20 18:01 ` Vladimir Oltean
2025-12-23  7:35 ` kernel test robot
2025-12-23 11:58 ` kernel test robot
2025-12-23 15:35 ` kernel test robot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tencent_9E2B81D645D04DFE191C86F128212F842B05@qq.com \
    --to=w.7erry@foxmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=vladimir.oltean@nxp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®