| From foo@baz Sat Dec 19 12:04:16 PM CET 2020 |
| From: Zhang Changzhong <zhangchangzhong@huawei.com> |
| Date: Fri, 4 Dec 2020 16:48:56 +0800 |
| Subject: net: bridge: vlan: fix error return code in __vlan_add() |
| |
| From: Zhang Changzhong <zhangchangzhong@huawei.com> |
| |
| [ 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: f8ed289fab84 ("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> |
| --- |
| net/bridge/br_vlan.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/net/bridge/br_vlan.c |
| +++ b/net/bridge/br_vlan.c |
| @@ -225,8 +225,10 @@ static int __vlan_add(struct net_bridge_ |
| } |
| |
| masterv = br_vlan_get_master(br, v->vid); |
| - if (!masterv) |
| + if (!masterv) { |
| + err = -ENOMEM; |
| goto out_filt; |
| + } |
| v->brvlan = masterv; |
| } |
| |