Skip to content

Commit 829e050

Browse files
iveceradavem330
authored andcommitted
net: bridge: fix uninitialized variables when BRIDGE_CFM is disabled
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: b6d0425 ("bridge: cfm: Netlink Notifications.") Cc: Henrik Bjoernlund <[email protected]> Signed-off-by: Ivan Vecera <[email protected]> Acked-by: Nikolay Aleksandrov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent fd8d973 commit 829e050

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

net/bridge/br_private.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1911,11 +1911,13 @@ static inline int br_cfm_status_fill_info(struct sk_buff *skb,
19111911

19121912
static inline int br_cfm_mep_count(struct net_bridge *br, u32 *count)
19131913
{
1914+
*count = 0;
19141915
return -EOPNOTSUPP;
19151916
}
19161917

19171918
static inline int br_cfm_peer_mep_count(struct net_bridge *br, u32 *count)
19181919
{
1920+
*count = 0;
19191921
return -EOPNOTSUPP;
19201922
}
19211923
#endif

0 commit comments

Comments
 (0)