Commit df2c4334 authored Mar 01, 2017 by Yotam Gigi Committed by David S. Miller Mar 01, 2017

bridge: Fix error path in nbp_vlan_init



Fix error path order in nbp_vlan_init, so if switchdev_port_attr_set
call failes, the vlan_hash wouldn't be destroyed before inited.

Fixes: efa5356b ("bridge: per vlan dst_metadata netlink support")
CC: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: Yotam Gigi <yotamg@mellanox.com>
Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3b45a410

net/bridge/br_vlan.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -997,10 +997,10 @@ int nbp_vlan_init(struct net_bridge_port *p)
		RCU_INIT_POINTER(p->vlgrp, NULL);
		synchronize_rcu();
		vlan_tunnel_deinit(vg);
		err_vlan_enabled:
		err_tunnel_init:
		rhashtable_destroy(&vg->vlan_hash);
		err_rhtbl:
		err_vlan_enabled:
		kfree(vg);

		goto out;