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

roopa-prabhu · davem330 · commit afcb50ba7f74 · 2017-02-17T13:33:41.000-05:00
Fixes: efa5356 ("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
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,8 @@ static int __vlan_tunnel_info_add(struct net_bridge_vlan_group *vg,`
`85`	`85`	`return 0;`
`86`	`86`	`out:`
`87`	`87`	`dst_release(&vlan->tinfo.tunnel_dst->dst);`
	`88`	`+ vlan->tinfo.tunnel_dst = NULL;`
	`89`	`+ vlan->tinfo.tunnel_id = 0;`
`88`	`90`
`89`	`91`	`return err;`
`90`	`92`	`}`