Commit ee4f52a8 authored by Zhang Changzhong's avatar Zhang Changzhong Committed by Jakub Kicinski
Browse files

net: bridge: vlan: fix error return code in __vlan_add() 



Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: f8ed289f ("bridge: vlan: use br_vlan_(get|put)_master to deal with refcounts")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Acked-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Link: https://lore.kernel.org/r/1607071737-33875-1-git-send-email-zhangchangzhong@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b410f04e

net/bridge/br_vlan.c

+3 −1
Original line number Diff line number Diff line
@@ -266,8 +266,10 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags, 
		}



		masterv = br_vlan_get_master(br, v->vid, extack);

		if (!masterv)

		if (!masterv) {

			err = -ENOMEM;

			goto out_filt;

		}

		v->brvlan = masterv;

		if (br_opt_get(br, BROPT_VLAN_STATS_PER_PORT)) {

			v->stats = netdev_alloc_pcpu_stats(struct br_vlan_stats);