summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJon Maloy <jon.maloy@ericsson.com>2017-12-18 20:03:05 +0100
committerDavid S. Miller <davem@davemloft.net>2017-12-19 14:10:03 -0500
commit3db096011722fd8717e57687ae94b6917a11c9cc (patch)
tree1bb0c5a3fe51577436b8462ed052025c17bad27d /net
parentc9fefa08190fc879fb2e681035d7774e0a8c5170 (diff)
downloadlinux-3db096011722fd8717e57687ae94b6917a11c9cc.tar.bz2
tipc: fix list sorting bug in function tipc_group_update_member()
When, during a join operation, or during message transmission, a group member needs to be added to the group's 'congested' list, we sort it into the list in ascending order, according to its current advertised window size. However, we miss the case when the member is already on that list. This will have the result that the member, after the window size has been decremented, might be at the wrong position in that list. This again may have the effect that we during broadcast and multicast transmissions miss the fact that a destination is not yet ready for reception, and we end up sending anyway. From this point on, the behavior during the remaining session is unpredictable, e.g., with underflowing window sizes. We now correct this bug by unconditionally removing the member from the list before (re-)sorting it in. Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/tipc/group.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/tipc/group.c b/net/tipc/group.c
index b96ec429bb9b..bbc004eaa31a 100644
--- a/net/tipc/group.c
+++ b/net/tipc/group.c
@@ -351,8 +351,7 @@ void tipc_group_update_member(struct tipc_member *m, int len)
if (m->window >= ADV_IDLE)
return;
- if (!list_empty(&m->congested))
- return;
+ list_del_init(&m->congested);
/* Sort member into congested members' list */
list_for_each_entry_safe(_m, tmp, &grp->congested, congested) {