net: bridge: mrp: fix Option TLV length in MRP_Test frames
Subsystems (3)
PATCH v2 1/1 net: bridge: mrp: fix Option TLV length in MRP_Test frames
oui is a pointer, so sizeof(oui) is the pointer size. The MRA Option TLV thus advertises a wrong length (15 vs 10 on x86_64), causing misparsing of the frame on peers. Fix is to replace with sizeof(*oui).
---
v2: target net and add Fixes header
v1: https://lore.kernel.org/bridge/[email protected]/
--- net/bridge/br_mrp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bridge/br_mrp.c +1 -1
@@ -215,7 +215,7 @@ static struct sk_buff *br_mrp_alloc_test_skb(struct br_mrp *mrp,struct br_mrp_oui_hdr *oui =NULL ;u8 length; - length =sizeof (*sub_opt) +sizeof (*sub_tlv) +sizeof (oui) + + length =sizeof (*sub_opt) +sizeof (*sub_tlv) +sizeof (*oui) +MRP_OPT_PADDING ;br_mrp_skb_tlv (skb,BR_MRP_TLV_HEADER_OPTION , length);
Signature · 1 line
2.55.0
Quoted 30 lines · David Corvaglia
oui is a pointer, so sizeof(oui) is the pointer size. The MRA Option TLV thus advertises a wrong length (15 vs 10 on
x86_64), causing misparsing of the frame on peers. Fix is to replace withsizeof(*oui).Fixes f7458934b079 ("net: bridge: mrp: Update the Test frames for MRA")Signed-off-by David Corvaglia <[email protected]>---
v2: target net and add Fixes header
v1: https://lore.kernel.org/bridge/[email protected]/--- net/bridge/br_mrp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/bridge/br_mrp.c +1
-1@@ -215,7 +215,7 @@ static struct sk_buff *br_mrp_alloc_test_skb(struct br_mrp *mrp,struct br_mrp_oui_hdr *oui =NULL ;u8 length; - length =sizeof (*sub_opt) +sizeof (*sub_tlv) +sizeof (oui) + + length =sizeof (*sub_opt) +sizeof (*sub_tlv) +sizeof (*oui) +MRP_OPT_PADDING ;br_mrp_skb_tlv (skb,BR_MRP_TLV_HEADER_OPTION , length);Signature · 1 line
2.55.0
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Sun, 26 Jul 2026 06:26:05 +0000 you wrote:
oui is a pointer, so sizeof(oui) is the pointer size. The MRA Option TLV thus advertises a wrong length (15 vs 10 on
x86_64), causing misparsing of the frame on peers. Fix is to replace withsizeof(*oui).Fixes f7458934b079 ("net: bridge: mrp: Update the Test frames for MRA")Signed-off-by David Corvaglia <[email protected]>[...]
Here is the summary with links:
- [net,v2] net: bridge: mrp: fix Option TLV length in MRP_Test frames
https://git.kernel.org/netdev/net/c/5546da86894d
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html