[PATCH 5.4 04/34] net: bridge: vlan: fix error return code in __vlan_add()

[Greg Kroah-Hartman]

From: Zhang Changzhong <zhangchangzh...@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 <hul...@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzh...@huawei.com>
Acked-by: Nikolay Aleksandrov <niko...@nvidia.com>
Link: 
https://lore.kernel.org/r/1607071737-33875-1-git-send-email-zhangchangzh...@huawei.com
Signed-off-by: Jakub Kicinski <k...@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gre...@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
@@ -260,8 +260,10 @@ static int __vlan_add(struct net_bridge_
                }
 
                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);