Skip to contentSkip to conversation

net: bridge: mcast: fixes for mcast querier state

PATCH Applied Nikolay Aleksandrov 2 participants 5 messages Aug 16, 2021

Subsystems (3)
lore
Share & tools
lore

Nikolay Aleksandrov

author maintainer
#0 lore raw

cover net: bridge: mcast: fixes for mcast querier state

From: Nikolay Aleksandrov <[email protected]>

Hi,
These three fix querier state dumping. The first patch can be considered a minor behaviour improvement, it avoids dumping querier state when mcast snooping is disabled. The second patch was a report of sizeof(0) used for nested netlink attribute size which should be just 0, and the third patch accounts for IPv6 querier state size when allocating skb for notifications.

Thanks,
Nik

Nikolay Aleksandrov (3):
net: bridge: mcast: don't dump querier state if snooping is disabled
net: bridge: mcast: drop sizeof for nest attribute's zero size
net: bridge: mcast: account for ipv6 size when dumping querier state

 net/bridge/br_multicast.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
Signature · 1 line
2.31.1
author maintainer
#1 lore raw

PATCH 1/3 net: bridge: mcast: don't dump querier state if snooping is disabled

From: Nikolay Aleksandrov <[email protected]>

A minor improvement to avoid dumping mcast ctx querier state if snooping is disabled for that context (either bridge or vlan).

---
 net/bridge/br_multicast.c | 4 ++++
 1 file changed, 4 insertions(+)
net/bridge/br_multicast.c +4 -0
index 0e5d6ba03457..9bdf12635871 100644
@@ -2943,6 +2943,10 @@ int br_multicast_dump_querier_state(struct sk_buff *skb,
 	struct net_bridge_port *p;
 	struct nlattr *nest;
 
+	if (!br_opt_get(brmctx->br, BROPT_MULTICAST_ENABLED) ||
+	    br_multicast_ctx_vlan_global_disabled(brmctx))
+		return 0;
+
 	nest = nla_nest_start(skb, nest_attr);
 	if (!nest)
 		return -EMSGSIZE;
Signature · 1 line
2.31.1
author maintainer
#2 lore raw

PATCH 2/3 net: bridge: mcast: drop sizeof for nest attribute's zero size

In reply to Nikolay Aleksandrov

From: Nikolay Aleksandrov <[email protected]>

This was a dumb error I made instead of writing nla_total_size(0) for a nest attribute, I wrote nla_total_size(sizeof(0)).

Fixes 606433fe3e11 ("net: bridge: mcast: dump ipv4 querier state")
---
 net/bridge/br_multicast.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/bridge/br_multicast.c +1 -1
index 9bdf12635871..76992ddac7e0 100644
@@ -2928,7 +2928,7 @@ __br_multicast_get_querier_port(struct net_bridge *br,
 
 size_t br_multicast_querier_state_size(void)
 {
-	return nla_total_size(sizeof(0)) +      /* nest attribute */
+	return nla_total_size(0) +		/* nest attribute */
 	       nla_total_size(sizeof(__be32)) + /* BRIDGE_QUERIER_IP_ADDRESS */
 	       nla_total_size(sizeof(int)) +    /* BRIDGE_QUERIER_IP_PORT */
 	       nla_total_size_64bit(sizeof(u64)); /* BRIDGE_QUERIER_IP_OTHER_TIMER */
Signature · 1 line
2.31.1
author maintainer
#3 lore raw

PATCH 3/3 net: bridge: mcast: account for ipv6 size when dumping querier state

In reply to Nikolay Aleksandrov

From: Nikolay Aleksandrov <[email protected]>

We need to account for the IPv6 attributes when dumping querier state.

Fixes 5e924fe6ccfd ("net: bridge: mcast: dump ipv6 querier state")
---
 net/bridge/br_multicast.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
net/bridge/br_multicast.c +7 -1
index 76992ddac7e0..e411dd814c58 100644
@@ -2931,7 +2931,13 @@ size_t br_multicast_querier_state_size(void)
 	return nla_total_size(0) +		/* nest attribute */
 	       nla_total_size(sizeof(__be32)) + /* BRIDGE_QUERIER_IP_ADDRESS */
 	       nla_total_size(sizeof(int)) +    /* BRIDGE_QUERIER_IP_PORT */
-	       nla_total_size_64bit(sizeof(u64)); /* BRIDGE_QUERIER_IP_OTHER_TIMER */
+	       nla_total_size_64bit(sizeof(u64)) + /* BRIDGE_QUERIER_IP_OTHER_TIMER */
+#if IS_ENABLED(CONFIG_IPV6)
+	       nla_total_size(sizeof(struct in6_addr)) + /* BRIDGE_QUERIER_IPV6_ADDRESS */
+	       nla_total_size(sizeof(int)) +		 /* BRIDGE_QUERIER_IPV6_PORT */
+	       nla_total_size_64bit(sizeof(u64)) +	 /* BRIDGE_QUERIER_IPV6_OTHER_TIMER */
+#endif
+	       0;
 }
 
 /* protected by rtnl or rcu */
Signature · 1 line
2.31.1
#4 lore raw
In reply to Nikolay Aleksandrov
This series was applied to netdev/net-next.git (refs/heads/master):

Hello:

This series was applied to netdev/net-next.git (refs/heads/master):

Quoted 11 lines · On Mon, 16 Aug 2021 13:11:31 +0300 you wrote:

From: Nikolay Aleksandrov <[email protected]>

Hi,
These three fix querier state dumping. The first patch can be considered a minor behaviour improvement, it avoids dumping querier state when mcast snooping is disabled. The second patch was a report of sizeof(0) used for nested netlink attribute size which should be just 0, and the third patch accounts for IPv6 querier state size when allocating skb for notifications.

[...]

Here is the summary with links:
- [net-next,1/3] net: bridge: mcast: don't dump querier state if snooping is disabled

    https://git.kernel.org/netdev/net-next/c/f137b7d4ecf8
  - [net-next,2/3] net: bridge: mcast: drop sizeof for nest attribute's zero size
    https://git.kernel.org/netdev/net-next/c/cdda378bd8d9
  - [net-next,3/3] net: bridge: mcast: account for ipv6 size when dumping querier state
    https://git.kernel.org/netdev/net-next/c/175e66924719

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html