net: bridge: vlan: fix error return code in __vlan_add()
[ Upstream commit ee4f52a8de2c6f78b01f10b4c330867d88c1653a ]
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.
Fixes: f8ed289fab
("bridge: vlan: use br_vlan_(get|put)_master to deal with refcounts")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Link: https://lore.kernel.org/r/1607071737-33875-1-git-send-email-zhangchangzhong@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
db49408ad9
commit
e64cc46270
1 changed files with 3 additions and 1 deletions
|
@ -242,8 +242,10 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags)
|
|||
}
|
||||
|
||||
masterv = br_vlan_get_master(br, v->vid);
|
||||
if (!masterv)
|
||||
if (!masterv) {
|
||||
err = -ENOMEM;
|
||||
goto out_filt;
|
||||
}
|
||||
v->brvlan = masterv;
|
||||
v->stats = masterv->stats;
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue