| Message ID | 20211028155835.2134753-1-ivecera@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 829e050eea69c7442441b714b6f5b339b5b8c367 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v2] net: bridge: fix uninitialized variables when BRIDGE_CFM is disabled | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Single patches do not need cover letters |
| netdev/fixes_present | success | Fixes tag present in non-next series |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 6 of 6 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 3 this patch: 3 |
| netdev/kdoc | success | Errors and warnings before: 3 this patch: 3 |
| netdev/verify_fixes | success | Fixes tag looks correct |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 13 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 3 this patch: 3 |
| netdev/header_inline | success | No static functions without inline keyword in header files |
On 28/10/2021 18:58, Ivan Vecera wrote: > 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> > --- > 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 37ca76406f1e..fd5e7e74573c 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 > Thank you, Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Thu, 28 Oct 2021 17:58:35 +0200 you wrote: > 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> > > [...] Here is the summary with links: - [net,v2] net: bridge: fix uninitialized variables when BRIDGE_CFM is disabled https://git.kernel.org/netdev/net/c/829e050eea69 You are awesome, thank you!
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 37ca76406f1e..fd5e7e74573c 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
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> --- net/bridge/br_private.h | 2 ++ 1 file changed, 2 insertions(+)