[PATCH][net-next][v2] net: bridge: fix a possible 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: bridge@lists.linux-foundation.org
cc: Nikolay Aleksandrov <redacted>
CC: Roopa Prabhu <redacted>
Signed-off-by: Zhang Yu <redacted>
Signed-off-by: Li RongQing <redacted>
---
 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..8c9297a01947 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c

@@ -303,6 +303,10 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags)
 	if (p) {
 		__vlan_vid_del(dev, br, v->vid);
 		if (masterv) {
+			if (v->stats && masterv->stats != v->stats)
+				free_percpu(v->stats);
+			v->stats = NULL;
+
 			br_vlan_put_master(masterv);
 			v->brvlan = NULL;
 		}

-- 
2.16.2

On 15/10/2018 14:00, Li RongQing wrote:

Thanks,
Signed-off-by: Nikolay Aleksandrov <redacted>

From: Li RongQing <redacted>
Date: Mon, 15 Oct 2018 19:00:31 +0800

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: bridge@lists.linux-foundation.org
cc: Nikolay Aleksandrov <redacted>
CC: Roopa Prabhu <redacted>
Signed-off-by: Zhang Yu <redacted>
Signed-off-by: Li RongQing <redacted>

Applied.