From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 61C0535E950; Thu, 28 May 2026 20:24:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779999851; cv=none; b=pIPz9LXeXE9HiqFLdCfr3DsVsYt1mWbad/mVS4SbYfhMIlCMJE9UHS6gTYxQek6HsOtLK9vKInhFKA6wnBVfaBjGwJUrFW//gkNz0W3TCfV8VS7Xy3eZzYzNR+AMGrLyKW2geyP4KvOM8Uka+wi/7tYogCCCB0eTvSgKG+p5GGI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779999851; c=relaxed/simple; bh=lwNu+QzENARMoTVOGbXAV9WS1CZ1PAwa1UkhhF6AyDU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=irGSj7AET1BaobYianrCSIpEWKz7NSMYik/tV+dV9PTjeIrjYdl446hvcvqLCACUogOUhYFVHVRNCWapzjL8C5coWGT+p8bEsuXlXZOtaRjWY8O7O1KKktUaaHBZxBZP4KMWcuihyHV+jb7eAx5uOHKjxZaVf7YyZIlGsN8DE+Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OKnSPdG3; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="OKnSPdG3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 817631F00A3F; Thu, 28 May 2026 20:24:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779999850; bh=p+fICQSzhUuQBHy6VP/QpNmQMrdQV7ddGAlJyr9DOOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OKnSPdG3Fbk0MvUg4wIsIUYEnrcgZkyQ1kKfkG4pgfdJWYDgRfiy1UoH1MbbVaiHT bsAegO/ejlQAUXld9gPolm98eecAQAr1FjsRMiaSgzNyZtCYvKHtszq3IyKqKVv2bD ZLZSGhBEaOxcUC7kbeIH7/z/Gv8P0gbvi0pDn/Do= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ijae Kim , Myeonghun Pak , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 213/377] net: lan966x: avoid unregistering netdev on register failure Date: Thu, 28 May 2026 21:47:31 +0200 Message-ID: <20260528194644.567234615@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194638.371537336@linuxfoundation.org> References: <20260528194638.371537336@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Myeonghun Pak [ Upstream commit c4f3d6eb1fcf6cd9ce4644f604d5aad1ce594dfc ] lan966x_probe_port() stores the newly allocated net_device in the port before calling register_netdev(). If register_netdev() fails, the probe error path calls lan966x_cleanup_ports(), which sees port->dev and calls unregister_netdev() for a device that was never registered. Destroy the phylink instance created for this port and clear port->dev before returning the registration error. The common cleanup path now skips ports without port->dev before reaching the registered netdev cleanup, so it only handles ports that reached the registered-netdev lifetime. This also avoids treating an uninitialized FDMA netdev and the failed port as a NULL == NULL match in the common cleanup path. Fixes: d28d6d2e37d1 ("net: lan966x: add port module support") Co-developed-by: Ijae Kim Signed-off-by: Ijae Kim Signed-off-by: Myeonghun Pak Link: https://patch.msgid.link/20260506124331.31945-1-mhun512@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c index 47752d3fde0b1..1179a6e127c52 100644 --- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c @@ -749,11 +749,10 @@ static void lan966x_cleanup_ports(struct lan966x *lan966x) for (p = 0; p < lan966x->num_phys_ports; p++) { port = lan966x->ports[p]; - if (!port) + if (!port || !port->dev) continue; - if (port->dev) - unregister_netdev(port->dev); + unregister_netdev(port->dev); lan966x_xdp_port_deinit(port); if (lan966x->fdma && lan966x->fdma_ndev == port->dev) @@ -873,6 +872,9 @@ static int lan966x_probe_port(struct lan966x *lan966x, u32 p, err = register_netdev(dev); if (err) { dev_err(lan966x->dev, "register_netdev failed\n"); + phylink_destroy(phylink); + port->phylink = NULL; + port->dev = NULL; return err; } -- 2.53.0