lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 037/346] net: bridge: vlan: fix error return code in __vlan_add()
    Date
    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
    @@ -242,8 +242,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;
    v->stats = masterv->stats;
    } else {

    \
     
     \ /
      Last update: 2020-12-28 14:21    [W:2.313 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site