netdev - [PATCH] net: bridge: fix a memory leak in __vlan

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1539487305-12761-1-git-send-email-lirongqing@baidu.com>
Date:   Sun, 14 Oct 2018 11:21:45 +0800
From:   Li RongQing <lirongqing@...du.com>
To:     netdev@...r.kernel.org
Cc:     nikolay@...ulusnetworks.com, bridge@...ts.linux-foundation.org
Subject: [PATCH] net: bridge: fix a memory leak in __vlan_add

After per-port vlan stats, vlan stats should be released
when fail to add vlan

Fixes: 9163a0fc1f0c0 ("net: bridge: add support for per-port vlan stats")
cc: Nikolay Aleksandrov <nikolay@...ulusnetworks.com>
Signed-off-by: Zhang Yu <zhangyu31@...du.com>
Signed-off-by: Li RongQing <lirongqing@...du.com>
---
 net/bridge/br_vlan.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 9b707234e4ae..e08e269041dd 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -305,6 +305,10 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags)
 		if (masterv) {
 			br_vlan_put_master(masterv);
 			v->brvlan = NULL;
+
+			if (masterv->stats != v->stats && v->stats)
+				free_percpu(v->stats);
+			v->stats = NULL;
 		}
 	} else {
 		br_switchdev_port_vlan_del(dev, v->vid);
-- 
2.16.2