lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 551/917] net: bridge: fix uninitialized variables when BRIDGE_CFM is disabled
    Date
    From: Ivan Vecera <ivecera@redhat.com>

    [ Upstream commit 829e050eea69c7442441b714b6f5b339b5b8c367 ]

    Function br_get_link_af_size_filtered() calls br_cfm_{,peer}_mep_count()
    that return a count. When BRIDGE_CFM is not enabled these functions
    simply return -EOPNOTSUPP but do not modify count parameter and
    calling function then works with uninitialized variables.
    Modify these inline functions to return zero in count parameter.

    Fixes: b6d0425b816e ("bridge: cfm: Netlink Notifications.")
    Cc: Henrik Bjoernlund <henrik.bjoernlund@microchip.com>
    Signed-off-by: Ivan Vecera <ivecera@redhat.com>
    Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/bridge/br_private.h | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
    index 37ca76406f1e8..fd5e7e74573ce 100644
    --- a/net/bridge/br_private.h
    +++ b/net/bridge/br_private.h
    @@ -1911,11 +1911,13 @@ static inline int br_cfm_status_fill_info(struct sk_buff *skb,

    static inline int br_cfm_mep_count(struct net_bridge *br, u32 *count)
    {
    + *count = 0;
    return -EOPNOTSUPP;
    }

    static inline int br_cfm_peer_mep_count(struct net_bridge *br, u32 *count)
    {
    + *count = 0;
    return -EOPNOTSUPP;
    }
    #endif
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:48    [W:4.328 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site