Linux Ethernet Bridging - Mar 2017 - [Bridge] [PATCH net] 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: efa5356b0d97 ("bridge: per vlan dst_metadata netlink support")
CC: Roopa Prabhu <roopa at cumulusnetworks.com>
Signed-off-by: Yotam Gigi <yotamg at mellanox.com>
---
 net/bridge/br_vlan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 62e68c0..b838213 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -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;
-- 
2.4.11

On 3/1/17, 6:50 AM, Yotam Gigi wrote:
> 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: efa5356b0d97 ("bridge: per vlan dst_metadata netlink
support")
> CC: Roopa Prabhu <roopa at cumulusnetworks.com>
> Signed-off-by: Yotam Gigi <yotamg at mellanox.com>
> ---
>  
Acked-by: Roopa Prabhu <roopa at cumulusnetworks.com>

Thanks yotam.

From: Yotam Gigi <yotamg at mellanox.com>
Date: Wed,  1 Mar 2017 16:50:45 +0200
> 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: efa5356b0d97 ("bridge: per vlan dst_metadata netlink
support")
> CC: Roopa Prabhu <roopa at cumulusnetworks.com>
> Signed-off-by: Yotam Gigi <yotamg at mellanox.com>
Applied, thanks.