Commit d30a58ba authored by Chang Xiangzhong's avatar Chang Xiangzhong Committed by David S. Miller

net: sctp: bug-fixing: retran_path not set properly after transports recovering (v3)

When a transport recovers due to the new coming sack, SCTP should
iterate all of its transport_list to locate the __two__ most recently used
transport and set to active_path and retran_path respectively. The exising
code does not find the two properly - In case of the following list:

[most-recent] -> [2nd-most-recent] -> ...

Both active_path and retran_path would be set to the 1st element.

The bug happens when:
1) multi-homing
2) failure/partial_failure transport recovers
Both active_path and retran_path would be set to the same most-recent one, in
other words, retran_path would not take its role - an end user might not even
notice this issue.
Signed-off-by: default avatarChang Xiangzhong <changxiangzhong@gmail.com>
Acked-by: default avatarVlad Yasevich <vyasevich@gmail.com>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dccf76ca
...@@ -907,8 +907,8 @@ void sctp_assoc_control_transport(struct sctp_association *asoc, ...@@ -907,8 +907,8 @@ void sctp_assoc_control_transport(struct sctp_association *asoc,
if (!first || t->last_time_heard > first->last_time_heard) { if (!first || t->last_time_heard > first->last_time_heard) {
second = first; second = first;
first = t; first = t;
} } else if (!second ||
if (!second || t->last_time_heard > second->last_time_heard) t->last_time_heard > second->last_time_heard)
second = t; second = t;
} }
...@@ -929,6 +929,8 @@ void sctp_assoc_control_transport(struct sctp_association *asoc, ...@@ -929,6 +929,8 @@ void sctp_assoc_control_transport(struct sctp_association *asoc,
first = asoc->peer.primary_path; first = asoc->peer.primary_path;
} }
if (!second)
second = first;
/* If we failed to find a usable transport, just camp on the /* If we failed to find a usable transport, just camp on the
* primary, even if it is inactive. * primary, even if it is inactive.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment