From nobody Sun Feb 8 07:21:45 2026 Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) (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 389018248B for ; Sat, 20 Dec 2025 19:01:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=162.62.57.210 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766257308; cv=none; b=XfgZXrUR8ZDBtciqv29Nf+jwckNl51nOj3iC7vVvTYaiPLij3c1jkq/thq2blSfdX0sszpXsetgsD9G7Tgz4UR/2Wh4oLjG3JFiPRevBD5RvNon9v6Egs6mKRy1jlzr6ZDxO/kHTD7dpxFD2TfkRJpOne8vRJcdYCH2Evxp2s28= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766257308; c=relaxed/simple; bh=vnD1GyI4VGLWY/sGBoexe1ZQUge+RVFNghpiT/MhYNQ=; h=Message-ID:From:To:Cc:Subject:Date:MIME-Version; b=Dy4uPAtbQ6VTvgkOLRw6nFzubnNqUttU1sXknVRrlLpANz17Wr9QPP1MnvEYAO5DctRgXJjN8qHM3euD0qEOQX3v7Dwe3AH+nquz6bQgnbIh1WIdm7YZZjBSAGRUmWhJiqc3Af6HWxwWYSYUx/tc2porFDGdgwic/sjimYkN908= 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=MaOoE8Qp; arc=none smtp.client-ip=162.62.57.210 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="MaOoE8Qp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1766257301; bh=KU3pyGnQR+h5GWvS/5+kDMS0LeFUEa6bI5Dcar/8lsg=; h=From:To:Cc:Subject:Date; b=MaOoE8QpDwJv/BRiP9bDVD0VwX57I11Ed7sB5wgvBrWqcVF2D2+X0sbPj9EUWxoet ejFf6QF9uatifaMBmjznCdjLROzuKAS/MbhRwJK9dFLHRrby/JBkMHWoV/SOppFxCG 83kL/U3+R3i+akHzHCtzjmWVEJ0Zt3IR+cLZGkDg= Received: from 7erry.customer.ask4.lan ([31.205.230.119]) by newxmesmtplogicsvrszb51-1.qq.com (NewEsmtp) with SMTP id 6233094; Sun, 21 Dec 2025 03:01:34 +0800 X-QQ-mid: xmsmtpt1766257294tauss7hip Message-ID: X-QQ-XMAILINFO: MOnsIKIZIC7LoayIyF0P3pZgXt1xd5mgCLh/IhgSnGFd0/ZRK+8TBWS4lQH9y0 Wno75ERkKfWaHdXrHzy/AjM7V5Uedd+s7t6HgubQWNvTk/e5feAzSSQw1iRz6Mi46Panuxoki574 kDEmZ067SSNy8pzGwtMS8IS6Chn7jpOAgdM8tvQBMKFLBxYppvREXb8PV6rKC3FjqD3/GoGW8VTg hg1bbpvuTIOA0AprpbuDH3Mu4CVLO7XyA0ZrDCNJQI0CBLXvzCmpXnBLQc1FkCE+4njYXWyNU5fz TW7EXgVnM+CyCHOG4ZWQ83k6qU6aTSQvLyettnqP7StWzFVF+K6hCAD1JruUXXN/Uq2bJ4xOOgsp i3YN1PYMaHjKzw4T0UoQ0TKH8MxNDSWErImGUYoJatFW4OEM4xIK2A3HAh9CPOYmq7HODHDONRkF dI0QRHsZ+e1n56ZBdJM/LPZfdCBTCk8STkP+/k2lpJd6pV8jNXfbCwMfMuQPGwWjJsEij1G+5Fjy HznN0gl3HpnvFnNWlTIEOgJNWzwjYXOwiNPespfBhghhz7wNAIVRbKM+qzHRbx6Xq/G2Cv2orz1R W1uFT5AcktTrPmbSA853ynHA/OJbe0KF+Ct7SBKb9qdYyaGhXmN4rqNOq7Qh0MRqw519GsQjj0PF vCHllJsnvUrjD9vs8OzJe/3K/4rlqK3U5RvgWnlX9D8HYkTprEAGJ12NZ6HpsQ48goBpB+sRvNfP oCn8Nh7DB8l1hrSteKTLPBPA8jE3BPfi/8KVqOdTde+DbOKwkKI1FwTbXEs8iPsqBrLLrv4QzzAa RuVcR9UzOgQzrus4dYRZ5U8m9WFzqRN34486b0A0zCo6Hu4qVet/1P97cVZTuKdUakxadSDeTtdW 9vmnli7T9gvUV2m95qBBVqU3tM6I579IP4oN8YRbIC3j7SywdtjUP1jZOdR64Gk2AmA8AgrdGWsq EooIaiIkuz0q0f6g/i5rrR5LRdZXXq1GarGzPmLu3QvmklMwL6vNINQG2zJlmAIVPjTKCErHhG6X EkruYY9tfICULWiVDVY1fWuDlSIpvVtfzjsqJ1QyoBU1QE0D+8YdWd5/QL+fnIFg6K9voVrJA0bD M8DxeDVr5OHdAp6TOZQDmMCBXpNjyT4COcjpPdg5O4GzXU+RirsI8oEWNQzOv/3Fr7cdcqEmis+M Ot8qA= X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= From: Jerry Wu To: vladimir.oltean@nxp.com Cc: claudiu.manoil@nxp.com, alexandre.belloni@bootlin.com, UNGLinuxDriver@microchip.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jerry Wu Subject: [PATCH net v2] net: mscc: ocelot: Fix crash when adding interface under a lag Date: Sat, 20 Dec 2025 19:01:23 +0000 X-OQ-MSGID: <20251220190123.27710-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") fixed a similar issue in the lan966x driver caused by a NULL pointer derefe= rence. The ocelot_set_aggr_pgids() function in the ocelot driver has similar logic and is susceptible to the same crash. This issue specifically affects the ocelot_vsc7514.c frontend, which leaves unused ports as NULL pointers. The felix_vsc9959.c frontend is unaffected as it uses the DSA framework which registers all ports. Fix this by checking if the port pointer is valid before accessing it. Fixes: 528d3f190c98 ("net: mscc: ocelot: drop the use of the "lags" array") Signed-off-by: Jerry Wu --- drivers/net/ethernet/mscc/ocelot.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc= /ocelot.c index 08bee56aea35..6f917fd7af4d 100644 --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c @@ -2307,14 +2307,16 @@ 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 *ocelot_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 (!ocelot_port || !ocelot_port->bond || (visited & BIT(lag))) continue; =20 + bond =3D ocelot_port->bond; bond_mask =3D ocelot_get_bond_mask(ocelot, bond); =20 for_each_set_bit(port, &bond_mask, ocelot->num_phys_ports) { --=20 2.52.0