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 203FB442106; Thu, 30 Jul 2026 15:08:19 +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=1785424100; cv=none; b=d1wbdNYF96ypm8R+HRjKy47zFVIFKriYXg1HP3GSgIaJ2yGOQTSWrKAtVY4+VwBv8lQcn+uG00JQYgfBoWM+v1Fhs4qnRzVoYy5slWD4ULtMkJYOM3oW7jgaz1eGdrwkkuEsKYwGJuHWipZbioedTexnoPGG5shaF+LTHvL2aVE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785424100; c=relaxed/simple; bh=j9vlw36XAZ/Z8D7OwTerxv3KLM0rFAnirs8+7fes6A4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FSqx5IBgRf9wUrdnQ+rgbLhguK8ioxU93f7B9/AgjdPZkzj0IpxVhdUXw/5WWztucsd3PDR1JNArKaYxZFq+ArKAZEyu6/kqkGTsXjkVqSYJVuOxjm2tYoe/9Di/kuTxfobtllU5FRYna9vQswNS3F/JOJ4C/CfYLdjP1ADfrM4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VVJR0gXl; 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="VVJR0gXl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7AC311F000E9; Thu, 30 Jul 2026 15:08:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1785424099; bh=RoI+7vtUmGkYKfjIWN/wgSmidyy6Adqk5uRlUEfB2Ac=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VVJR0gXlGI/As+gHBd6rsT4hieiX5K9eGbqbkrzE5ZtdvrA8lD3d0obc0B8Zw0l7Z dIUuPOII8lx77hFY1vIfQB75tgHpioRwt++d7UvPg1MEOynokl5ulPkSqSQ+7erJwf 4YHMuGmy6hyyoIsf1vTdnXvD+4RjoDKo0Yy0J854= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+456957213f32970c0762@syzkaller.appspotmail.com, Eric Dumazet , Fernando Fernandez Mancera , Felix Maurer , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 276/675] net: hsr: fix memory leak on slave unregistration by removing synced VLANs Date: Thu, 30 Jul 2026 16:10:06 +0200 Message-ID: <20260730141450.992618926@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260730141445.110192266@linuxfoundation.org> References: <20260730141445.110192266@linuxfoundation.org> User-Agent: quilt/0.69 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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit dcf15eaf5641812f1cfc5e96537380132a7da89d ] When an HSR master device is brought UP, it auto-adds VLAN 0 via vlan_vid0_add(), which propagates VID 0 to its slave devices (slave A and B). If a slave device is later unregistered while HSR is active (e.g., during netns cleanup or interface destruction), hsr_del_port() is called to detach the slave port from the HSR master. However, hsr_del_port() currently does not delete the VLAN IDs that were synced to the slave device by HSR. As a result, the slave device retains a refcount on VID 0 (and any other synced VLANs). When the slave device is destroyed, its vlan_info / vlan_vid_info structure remains allocated, leading to a memory leak. Fix this by calling vlan_vids_del_by_dev(port->dev, master->dev) in hsr_del_port() before unlinking slave A or slave B ports, matching the propagation logic in hsr_ndo_vlan_rx_add_vid() / hsr_ndo_vlan_rx_kill_vid() and the cleanup behavior in bonding and team drivers. Fixes: 1a8a63a5305e ("net: hsr: Add VLAN CTAG filter support") Reported-by: syzbot+456957213f32970c0762@syzkaller.appspotmail.com Closes: https://lore.kernel.org/netdev/6a4cb6ca.57639fcc.86d58.000b.GAE@google.com/T/#u Signed-off-by: Eric Dumazet Reviewed-by: Fernando Fernandez Mancera Reviewed-by: Felix Maurer Link: https://patch.msgid.link/20260721101240.995597-1-edumazet@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/hsr/hsr_slave.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c index afe06ba00ea447..474f44f1ee88ce 100644 --- a/net/hsr/hsr_slave.c +++ b/net/hsr/hsr_slave.c @@ -242,6 +242,8 @@ void hsr_del_port(struct hsr_port *port) netdev_rx_handler_unregister(port->dev); if (!port->hsr->fwd_offloaded) dev_set_promiscuity(port->dev, -1); + if (port->type == HSR_PT_SLAVE_A || port->type == HSR_PT_SLAVE_B) + vlan_vids_del_by_dev(port->dev, master->dev); netdev_upper_dev_unlink(port->dev, master->dev); eth_hw_addr_set(port->dev, port->original_macaddress); } -- 2.53.0