Skip to contentSkip to conversation

macvlan: fix macvlan_get_size() not reserving space for IFLA_MACVLAN_BC_CUTOFF

PATCH Applied Dudu Lu 4 participants 4 messages Apr 13 – Apr 16

Subsystems (2)
lore
Share & tools
lore

Dudu Lu

author
#0 lore raw

PATCH 1/1 macvlan: fix macvlan_get_size() not reserving space for IFLA_MACVLAN_BC_CUTOFF

macvlan_get_size() does not account for IFLA_MACVLAN_BC_CUTOFF, but macvlan_fill_info() conditionally includes it when port->bc_cutoff != 1. This causes nla_put_s32() to fail with -EMSGSIZE when the netlink skb runs out of space, triggering a WARN_ON in rtnetlink and preventing the interface from being dumped.

The bug can be reproduced with:

ip link add macvlan0 link eth0 type macvlan mode bridge ip link set macvlan0 type macvlan bc_cutoff 0
ip -d link show macvlan0 # fails with -EMSGSIZE

The bc_cutoff feature was added in commit 954d1fa1ac93 ("macvlan: Add netlink attribute for broadcast cutoff"), which added the nla_put_s32() call in macvlan_fill_info() but missed adding the corresponding nla_total_size(4) in macvlan_get_size(). A follow-up commit 55cef78c244d ("macvlan: add forgotten nla_policy for IFLA_MACVLAN_BC_CUTOFF") fixed the missing nla_policy entry but still did not fix the size calculation.

Fixes 954d1fa1ac93 ("macvlan: Add netlink attribute for broadcast cutoff")
---
 drivers/net/macvlan.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/macvlan.c +1 -0
index a71f058eceef..80f87599a503 100644
@@ -1681,6 +1681,7 @@ static size_t macvlan_get_size(const struct net_device *dev)
 		+ macvlan_get_size_mac(vlan) /* IFLA_MACVLAN_MACADDR */
 		+ nla_total_size(4) /* IFLA_MACVLAN_BC_QUEUE_LEN */
 		+ nla_total_size(4) /* IFLA_MACVLAN_BC_QUEUE_LEN_USED */
+		+ nla_total_size(4) /* IFLA_MACVLAN_BC_CUTOFF */
 		);
 }
 
Signature · 1 line
2.39.3 (Apple Git-145)
Reviewed-by on v1 1/1
#1 lore raw
Quoted 31 lines · Dudu Lu

macvlan_get_size() does not account for IFLA_MACVLAN_BC_CUTOFF, but macvlan_fill_info() conditionally includes it when port->bc_cutoff != 1. This causes nla_put_s32() to fail with -EMSGSIZE when the netlink skb runs out of space, triggering a WARN_ON in rtnetlink and preventing the interface from being dumped.

The bug can be reproduced with:

ip link add macvlan0 link eth0 type macvlan mode bridge ip link set macvlan0 type macvlan bc_cutoff 0
ip -d link show macvlan0 # fails with -EMSGSIZE

The bc_cutoff feature was added in commit 954d1fa1ac93 ("macvlan: Add netlink attribute for broadcast cutoff"), which added the nla_put_s32() call in macvlan_fill_info() but missed adding the corresponding nla_total_size(4) in macvlan_get_size(). A follow-up commit 55cef78c244d ("macvlan: add forgotten nla_policy for IFLA_MACVLAN_BC_CUTOFF") fixed the missing nla_policy entry but still did not fix the size calculation.

Fixes 954d1fa1ac93 ("macvlan: Add netlink attribute for broadcast cutoff")
---
  drivers/net/macvlan.c | 1 +
  1 file changed, 1 insertion(+)
drivers/net/macvlan.c +0 -0
index a71f058eceef..80f87599a503 100644

drivers/net/macvlan.c static size_t macvlan_get_size(const struct net_device *dev) · line 1686

Quoted 6 lines
drivers/net/macvlan.c +1 -0
@@ -1681,6 +1681,7 @@ static size_t macvlan_get_size(const struct net_device *dev)
  		+ macvlan_get_size_mac(vlan) /* IFLA_MACVLAN_MACADDR */
  		+ nla_total_size(4) /* IFLA_MACVLAN_BC_QUEUE_LEN */
  		+ nla_total_size(4) /* IFLA_MACVLAN_BC_QUEUE_LEN_USED */
+		+ nla_total_size(4) /* IFLA_MACVLAN_BC_CUTOFF */
  		);
  }

Please, use tree indication for the next submissions. As this patch fixes the issue, it will go to net tree.

Reviewed-by on v1 1/1
#2 lore raw
In reply to Dudu Lu
Quoted 11 lines · Dudu Lu

macvlan_get_size() does not account for IFLA_MACVLAN_BC_CUTOFF, but macvlan_fill_info() conditionally includes it when port->bc_cutoff != 1. This causes nla_put_s32() to fail with -EMSGSIZE when the netlink skb runs out of space, triggering a WARN_ON in rtnetlink and preventing the interface from being dumped.

The bug can be reproduced with:

ip link add macvlan0 link eth0 type macvlan mode bridge ip link set macvlan0 type macvlan bc_cutoff 0

Was this generated by LLM ?

AFAIK, iproute2 command would look like this

ip link set macvlan0 type macvlan bclim 0

Quoted 21 lines

ip -d link show macvlan0 # fails with -EMSGSIZE

The bc_cutoff feature was added in commit 954d1fa1ac93 ("macvlan: Add netlink attribute for broadcast cutoff"), which added the nla_put_s32() call in macvlan_fill_info() but missed adding the corresponding nla_total_size(4) in macvlan_get_size(). A follow-up commit 55cef78c244d ("macvlan: add forgotten nla_policy for IFLA_MACVLAN_BC_CUTOFF") fixed the missing nla_policy entry but still did not fix the size calculation.

Fixes 954d1fa1ac93 ("macvlan: Add netlink attribute for broadcast cutoff")
---
 drivers/net/macvlan.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/macvlan.c +0 -0
index a71f058eceef..80f87599a503 100644

drivers/net/macvlan.c static size_t macvlan_get_size(const struct net_device *dev) · line 1687

Quoted 7 lines
drivers/net/macvlan.c +1 -0
@@ -1681,6 +1681,7 @@ static size_t macvlan_get_size(const struct net_device *dev)
                + macvlan_get_size_mac(vlan) /* IFLA_MACVLAN_MACADDR */
                + nla_total_size(4) /* IFLA_MACVLAN_BC_QUEUE_LEN */
                + nla_total_size(4) /* IFLA_MACVLAN_BC_QUEUE_LEN_USED */
+               + nla_total_size(4) /* IFLA_MACVLAN_BC_CUTOFF */
                );
 }
 

Note that skbs have more tailroom than requested, because kmalloc() power-of-two roundings,
so the bug does not show in practice, just in case someone tries the repro and sees nothing wrong.

#3 lore raw
In reply to Dudu Lu
This patch was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:

Hello:

This patch was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:

Quoted 9 lines · On Mon, 13 Apr 2026 16:53:49 +0800 you wrote:

macvlan_get_size() does not account for IFLA_MACVLAN_BC_CUTOFF, but macvlan_fill_info() conditionally includes it when port->bc_cutoff != 1. This causes nla_put_s32() to fail with -EMSGSIZE when the netlink skb runs out of space, triggering a WARN_ON in rtnetlink and preventing the interface from being dumped.

The bug can be reproduced with:

[...]

Here is the summary with links:
- macvlan: fix macvlan_get_size() not reserving space for IFLA_MACVLAN_BC_CUTOFF

    https://git.kernel.org/netdev/net/c/fa92a77b0ed4

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html