From: Ivan Vecera <ivecera@redhat.com>
To: netdev@vger.kernel.org
Cc: Roopa Prabhu <roopa@nvidia.com>,
Nikolay Aleksandrov <nikolay@nvidia.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Horatiu Vultur <horatiu.vultur@microchip.com>,
Henrik Bjoernlund <henrik.bjoernlund@microchip.com>,
bridge@lists.linux-foundation.org (moderated list:ETHERNET
BRIDGE), linux-kernel@vger.kernel.org (open list)
Subject: [PATCH net] net: bridge: fix uninitialized variables when BRIDGE_CFM is disabled
Date: Wed, 27 Oct 2021 15:49:26 +0200 [thread overview]
Message-ID: <20211027134926.1412459-1-ivecera@redhat.com> (raw)
Function br_get_link_af_size_filtered() calls br_cfm_{,peer}_mep_count()
but does not check their return value. When BRIDGE_CFM is not enabled
these functions return -EOPNOTSUPP but do not modify count parameter.
Calling function then works with uninitialized variables.
Fixes: b6d0425b816e ("bridge: cfm: Netlink Notifications.")
Signed-off-by: Ivan Vecera <ivecera@redhat.com>
---
net/bridge/br_netlink.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 5c6c4305ed23..12d602495ea0 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -126,8 +126,10 @@ static size_t br_get_link_af_size_filtered(const struct net_device *dev,
return vinfo_sz;
/* CFM status info must be added */
- br_cfm_mep_count(br, &num_cfm_mep_infos);
- br_cfm_peer_mep_count(br, &num_cfm_peer_mep_infos);
+ if (br_cfm_mep_count(br, &num_cfm_mep_infos) < 0)
+ num_cfm_mep_infos = 0;
+ if (br_cfm_peer_mep_count(br, &num_cfm_peer_mep_infos) < 0)
+ num_cfm_peer_mep_infos = 0;
vinfo_sz += nla_total_size(0); /* IFLA_BRIDGE_CFM */
/* For each status struct the MEP instance (u32) is added */
--
2.32.0
next reply other threads:[~2021-10-27 13:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-27 13:49 Ivan Vecera [this message]
2021-10-27 13:54 ` [PATCH net] net: bridge: fix uninitialized variables when BRIDGE_CFM is disabled Nikolay Aleksandrov
2021-10-27 14:14 ` Ivan Vecera
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211027134926.1412459-1-ivecera@redhat.com \
--to=ivecera@redhat.com \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=henrik.bjoernlund@microchip.com \
--cc=horatiu.vultur@microchip.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nikolay@nvidia.com \
--cc=roopa@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).