tipc: fix bc_ackers underflow on duplicate GRP_ACK_MSG
Subsystems (4)
PATCH v2 1/1 tipc: fix bc_ackers underflow on duplicate GRP_ACK_MSG
The GRP_ACK_MSG handler in tipc_group_proto_rcv() currently decrements bc_ackers on every inbound group ACK, even when the same member has already acknowledged the current broadcast round.
Because bc_ackers is a u16, a duplicate ACK received after the last legitimate ACK wraps the counter to 65535. Once wrapped, tipc_group_bc_cong() keeps reporting congestion and later group broadcasts on the affected socket stay blocked until the group is recreated.
Fix this by ignoring duplicate or stale ACKs before touching bc_acked or bc_ackers. This makes repeated GRP_ACK_MSG handling idempotent and prevents the underflow path.
---
v2:
- make duplicate or stale GRP_ACK_MSG a full no-op via early return
- place acked in reverse xmas tree style
net/tipc/group.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/tipc/group.c +5 -1
@@ -746,6 +746,7 @@ void tipc_group_proto_rcv(struct tipc_group *grp, bool *usr_wakeup,u32 port =msg_origport (hdr);struct tipc_member *m, *pm;u16 remitted, in_flight; +u16 acked;if (!grp)return ;
@@ -798,7 +799,10 @@ void tipc_group_proto_rcv(struct tipc_group *grp, bool *usr_wakeup,case GRP_ACK_MSG :if (!m)return ; - m->bc_acked =msg_grp_bc_acked (hdr); + acked =msg_grp_bc_acked (hdr); +if (less_eq (acked, m->bc_acked)) +return ; + m->bc_acked = acked;if (--grp->bc_ackers)return ;list_del_init (&m->small_win);
Signature · 1 line
2.50.0
Tung Quang Nguyen
maintainerQuoted 12 lines
Subject: [PATCH net v2] tipc: fix
bc_ackersunderflow on duplicateGRP_ACK_MSGThe
GRP_ACK_MSGhandler intipc_group_proto_rcv()currently decrementsbc_ackerson every inbound group ACK, even when the same member has already acknowledged the current broadcast round.Because
bc_ackersis a u16, a duplicate ACK received after the last legitimate ACK wraps the counter to 65535. Once wrapped,tipc_group_bc_cong()keeps reporting congestion and later group broadcasts on the affected socket stay blocked until the group is recreated.
Quoted 5 lines
Fix this by ignoring duplicate or stale ACKs before touching
bc_ackedorbc_ackers. This makes repeatedGRP_ACK_MSGhandling idempotent and prevents the underflow path.Fixes 75da2163dbb6 ("tipc: introduce communication groups")
AI complains that above Fixes tag is not correct:
" The Fixes: tag appears to reference the wrong commit. The bug was actually introduced by commit 2f487712b893 ("tipc: guarantee that group broadcast doesn't bypass group unicast").
Commit 75da2163dbb6 introduced the basic group communication feature but did not include bc_ackers or GRP_ACK_MSG handling. Commit 2f487712b893 added the GRP_ACK_MSG handler with the buggy unconditional decrement:
if (--grp->bc_ackers)
Should the Fixes: tag be updated to:
"
I agree with AI review result. Could you please correct the Fixes tag ?
Quoted 38 lines
Signed-off-by Oleh Konko <[email protected]>---
v2:
- make duplicate or staleGRP_ACK_MSGa full no-op via early return
- place acked in reverse xmas tree style
net/tipc/group.c| 6 +++++-1 file changed, 5 insertions(+), 1 deletion(-)net/tipc/group.c index renamed from net/tipc/group.c +0
-0
e0e6227b433..14e6732624e100644net/tipc/group.c +1
-0@@ -746,6 +746,7 @@ void tipc_group_proto_rcv(struct tipc_group *grp, bool *usr_wakeup, u32 port = msg_origport(hdr);struct tipc_member *m, *pm;u16 remitted, in_flight; +u16 acked;if (!grp)return;net/tipc/group.c +4
-1@@ -798,7 +799,10 @@ void tipc_group_proto_rcv(struct tipc_group *grp,bool *usr_wakeup, case GRP_ACK_MSG: if (!m) return; - m->bc_acked =msg_grp_bc_acked (hdr); + acked = msg_grp_bc_acked(hdr); +if (less_eq (acked, m->bc_acked)) +return ; + m->bc_acked = acked;if (--grp->bc_ackers)return ;list_del_init(&m->small_win);--
2.50.0