From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 1C00F1F754A; Tue, 3 Dec 2024 15:21:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733239303; cv=none; b=pS0A5xT4sRBzl+EJYbQXZMVWyLkYfmEBMP11L3WvkZXj1LAco+mWDiiXJ4WlHHrw5Tvmkr2F/hjD1ZClOPM0MuwGmdxGzqAGbex+lCocOpqJ7jlQUOrU2JyBIZlwRWJeZ7siyOrCzG3UCUco+W55kzLABoHPiVwyNjZFd7EFNks= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733239303; c=relaxed/simple; bh=GwKEXxBvR0ONoU+YzKW6icGmH0s16w0LXK4pmCtGKbU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tKABJsoBO0e6/iCfzIH52bGzTitDP6NTQNQX1L65pf7iUHf1FYfmz8MxnW8jBApzNXI7guXKAaWXmODECm0B5zAoi/JW58zhWwYfusPqDJXceVgMY2+g3YApOD1BCFXf7WgIcUZKpTMfN4pkP99ItCRzodEdmnZUFaICN/0q2SY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=N0deknou; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="N0deknou" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92635C4CEDA; Tue, 3 Dec 2024 15:21:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733239303; bh=GwKEXxBvR0ONoU+YzKW6icGmH0s16w0LXK4pmCtGKbU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N0deknouu+Tu0JMCMeuShU5rFbEm7akSoA2rXx2oMG+WoQlAjWOIECOyNhMOAmx26 ddnkygMPGxgbhVmrG4QOGo2/HokqBtyCNiiRQya3DjwstvlMtpk3urfoMfeSiCpYjX 5ZlAnwU5B+gHIiqiS3SG/YDHF+bH6l/hSKqjxpA4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Raghuram Chary J , Oleksij Rempel , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.11 567/817] net: usb: lan78xx: Fix memory leak on device unplug by freeing PHY device Date: Tue, 3 Dec 2024 15:42:19 +0100 Message-ID: <20241203144018.042378289@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203143955.605130076@linuxfoundation.org> References: <20241203143955.605130076@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Oleksij Rempel [ Upstream commit ae7370e61c5d8f5bcefc2d4fca724bd4e9bbf789 ] Add calls to `phy_device_free` after `fixed_phy_unregister` to fix a memory leak that occurs when the device is unplugged. This ensures proper cleanup of pseudo fixed-link PHYs. Fixes: 89b36fb5e532 ("lan78xx: Lan7801 Support for Fixed PHY") Cc: Raghuram Chary J Signed-off-by: Oleksij Rempel Link: https://patch.msgid.link/20241116130558.1352230-2-o.rempel@pengutronix.de Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/usb/lan78xx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index 094a47b8b97eb..9f191b6ce8215 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -2380,6 +2380,7 @@ static int lan78xx_phy_init(struct lan78xx_net *dev) if (dev->chipid == ID_REV_CHIP_ID_7801_) { if (phy_is_pseudo_fixed_link(phydev)) { fixed_phy_unregister(phydev); + phy_device_free(phydev); } else { phy_unregister_fixup_for_uid(PHY_KSZ9031RNX, 0xfffffff0); @@ -4246,8 +4247,10 @@ static void lan78xx_disconnect(struct usb_interface *intf) phy_disconnect(net->phydev); - if (phy_is_pseudo_fixed_link(phydev)) + if (phy_is_pseudo_fixed_link(phydev)) { fixed_phy_unregister(phydev); + phy_device_free(phydev); + } usb_scuttle_anchored_urbs(&dev->deferred); -- 2.43.0