summaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorRoopa Prabhu <roopa@cumulusnetworks.com>2017-02-16 11:29:21 -0800
committerDavid S. Miller <davem@davemloft.net>2017-02-17 13:33:41 -0500
commitafcb50ba7f745eea32f91d7f63d6aa88f929f9c4 (patch)
tree5a49e4394d0a6f9290c09864eaf23f2c27438e7f /net/bridge
parent6850f8b50928463213532d7812b74161d31d3cbd (diff)
downloadlinux-afcb50ba7f745eea32f91d7f63d6aa88f929f9c4.tar.gz
linux-afcb50ba7f745eea32f91d7f63d6aa88f929f9c4.tar.bz2
linux-afcb50ba7f745eea32f91d7f63d6aa88f929f9c4.zip
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>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_vlan_tunnel.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bridge/br_vlan_tunnel.c b/net/bridge/br_vlan_tunnel.c
index b2b79a070162..6d2c4eed2dc8 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;
}