From: Roopa Prabhu <roopa@cumulusnetworks.com>
Date: Thu, 16 Feb 2017 19:29:21 +0000 (-0800)
Subject: bridge: vlan_tunnel: explicitly reset metadata attrs to NULL on failure
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=afcb50ba7f745eea32f91d7f63d6aa88f929f9c4;p=linux.git

bridge: vlan_tunnel: explicitly reset metadata attrs to NULL on failure

Fixes: efa5356b0d97 ("bridge: per vlan dst_metadata netlink support")
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Reviewed-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/bridge/br_vlan_tunnel.c b/net/bridge/br_vlan_tunnel.c
index b2b79a0701626..6d2c4eed2dc89 100644
--- a/net/bridge/br_vlan_tunnel.c
+++ b/net/bridge/br_vlan_tunnel.c
@@ -85,6 +85,8 @@ static int __vlan_tunnel_info_add(struct net_bridge_vlan_group *vg,
 	return 0;
 out:
 	dst_release(&vlan->tinfo.tunnel_dst->dst);
+	vlan->tinfo.tunnel_dst = NULL;
+	vlan->tinfo.tunnel_id = 0;
 
 	return err;
 }