From nobody Sun Feb 8 20:22:54 2026 Received: from out203-205-221-235.mail.qq.com (out203-205-221-235.mail.qq.com [203.205.221.235]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E5A0B25C804 for ; Sat, 20 Dec 2025 17:33:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=203.205.221.235 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766252040; cv=none; b=MSLOgqsBZEr5wgxQugAzpCTTAEIDAHzS63Xo+zpxOBKl+q6E+adUBawaY/HWLhfC2Jall0LSLIzeHj14Gg3EvdMiIJhprFvFQ6AiV7gkfpAbRF9XJXBB52iz8MEwb12m2pwwKlhfPk15cg9CpjBQSMZNgMu2sMHe/O1Mk/wefHY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766252040; c=relaxed/simple; bh=SOJNpL/2UuatzwkkqqG8MJ5bDJeY9PprDgCCxwyAVPg=; h=Message-ID:From:To:Cc:Subject:Date:MIME-Version; b=mHnBeOdIZxwyjlIP7l9QFxfdEgukZGjAKoATaQjDhrQtEA9jkd4aA/FpZeYaBvY2Ba7iNz0A8IJ+dUcBX683b8A/tHWjaq/08w8CpPqhKQyOIN+ODTEeGGrOR2lNW7vqq3M1xw/Xr5d6uIn7p0amyPGJJ0elcD4mkc3WVQ2Uo+U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=foxmail.com; spf=pass smtp.mailfrom=foxmail.com; dkim=pass (1024-bit key) header.d=foxmail.com header.i=@foxmail.com header.b=rpf1oMNF; arc=none smtp.client-ip=203.205.221.235 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=foxmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=foxmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=foxmail.com header.i=@foxmail.com header.b="rpf1oMNF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1766252029; bh=oaItoHOP2XcOYpe+ZcuNII4f+J9MA2HTwdpNbP5cmjI=; h=From:To:Cc:Subject:Date; b=rpf1oMNFuxDw8P8zhJ1mO9nZxOiB6Bn8avhgi1z7gizdBDgAOGtEqzKn7pof7Vcz2 ImKGexj5HtJYSoChOl9Rs9IBfjpg6IhjxOhqZFaJgjmgEOo/D7vw+lOKq+Dc7pTMH8 nZei4sXhgR/B6rM4HrDvc/Zvs5mHsuP5/JJVvooA= Received: from 7erry.customer.ask4.lan ([31.205.230.119]) by newxmesmtplogicsvrsza63-0.qq.com (NewEsmtp) with SMTP id 82328E53; Sun, 21 Dec 2025 01:32:35 +0800 X-QQ-mid: xmsmtpt1766251955tc3o82sl9 Message-ID: X-QQ-XMAILINFO: OYTBn1rNHH7tcNgNvn4artiNEi3AG2rcAHMc5RWrIK5WQcgq160chDaAf8HyEv MzSS8tDhPJ+EdirhIg+hthJKoNVcyhL/PZn+7DY0lUz65fIyuMmk6l0BWjgkj3HDW2xzPgQYnHWH dLPazJNhdwu+NF+puqe/n5XJM3g+IsHZ/75w0IPb8M6VjExTwuWZSOAvsDP1HHjyIkv1aRHPieyU OT/K5IwxipnWa9SCUeZEySPygRnMqf3PN8C6ibvZsR8KsBNbKht6BCMpQ+eJuHkM8cBUUUriBChB LSk/n4T10gHn/AZiiVqGNQqzILItW8tv4zvaTqp2Y3vIkSjU4lw81J85pAVUOJeedu9BnN0sE6ar ARtv8SI7JOtpuo56xFDoJKKtxAEctYYl/sPz74hoP7QGsys0PlDdBCvdox2nsUkyBFF2sHlfoFu9 kIN0pj7wQvFT0oZWh/RFuprsZYnMuvqaJRZheLi8/gfplvy0sGZvFAkVi3MIfWfPWrxqwHXCQD10 bjiI2vB/uYLs7Kq0fM+sBk+jX4Yh8DyFp3flsUtduAzFkDfLiZRLWtiYdJWXXd3sA2GhRK6e4qWR IAeu/CA7CHARPt8i5e1/dbCiV7zdeiV1IbwVjtv2JRML2TWlWpJZbNy1+tPENELvKvxvjSJMhmff 7PkmXRVZGlfMVOD+pCEZJPMgB8iWlyOtZ/J1whRN3BpZSdVSmlQ7EjOHKX9lmGPU+yp5r3+15+MP EH8hZSTmK64PodpMFQpJMYIv+y6O027p1pwA7U+bO5oyFNQbgY1CM2DBWERGs1qZKqrg1wI+KhgO q2Ke30VZMLNGskbD9nN/jljUBF2C0PWt5kZqkRDA0+0z0wdQw1hkkiWy3UMVFR5yIK9HMJwJMNqx HSlgL/gc9PeIKuBrgUoAA4NMAS/tiOVNP6d3TRiBcVVwXsoKCxfONNqSmjPTUR9QFkdCl0WWZLsH RG2wRdj1Q53y/KlR3h/VGy0vMRUooGoV7CnB6kYDaZnBoZGutkZOIl3XSV2ORY24OSA8lkl2sqUq sgoWUpQw7PJGpOp4l1Bv11TZQfcBC2gXpZ2xssuRiuu4o6TIRPcFlupjwEukXHPwFEt2MVXIgo6a QDdBVz9eQCSFKT8A/AmHUSgTSbWlua1o5uGmr+ X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= From: Jerry Wu To: vladimir.oltean@nxp.com Cc: linux-kernel@vger.kernel.org, Jerry Wu Subject: [PATCH] Prevent crash when adding interface under a lag Date: Sat, 20 Dec 2025 17:32:15 +0000 X-OQ-MSGID: <20251220173215.1939-1-w.7erry@foxmail.com> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 simi= lar logic. This patch fix it in the same way as the aforementioned patch did. Signed-off-by: Jerry Wu --- 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 *oc= elot) =20 /* Now, set PGIDs for each active LAG */ for (lag =3D 0; lag < ocelot->num_phys_ports; lag++) { - struct net_device *bond =3D ocelot->ports[lag]->bond; + struct ocelot_port *port =3D ocelot->ports[lag]; int num_active_ports =3D 0; + struct net_device *bond; unsigned long bond_mask; u8 aggr_idx[16]; =20 - if (!bond || (visited & BIT(lag))) + if (!port || !port->bond || (visited & BIT(lag))) continue; =20 + bond =3D port->bond; bond_mask =3D ocelot_get_bond_mask(ocelot, bond); =20 for_each_set_bit(port, &bond_mask, ocelot->num_phys_ports) { struct ocelot_port *ocelot_port =3D ocelot->ports[port]; =20 + if (!port) + continue; + // Destination mask ocelot_write_rix(ocelot, bond_mask, ANA_PGID_PGID, port); --=20 2.51.0