d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r284326:

Browse Source 
In case of an output error, continue with the next net, don't try to
continue sending on the same net.

This fixes a bug where an invalid mbuf chain was constructed, if a
full size frame of control chunks should be sent and there is a
output error.

Based on a discussion with rrs@, change move to the next net. This fixes
the bug and improves the behaviour.

Thanks to Irene Ruengeler for spending a lot of time in narrowing this
problem down.
This commit is contained in:
tuexen 2015-06-16 08:21:58 +00:00
parent 1d2632e58b
commit 74eb079379
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/netinet/sctp_output.c
View File

@ -8001,6 +8001,7 @@ again_one_more_time:
} else {
r_mtu = mtu;
}
error = 0;
/************************/
/* ASCONF transmission */
/************************/
@ -8159,7 +8160,7 @@ again_one_more_time:
sctp_move_chunks_from_net(stcb, net);
}
*reason_code = 7;
continue;
break;
} else
asoc->ifp_had_enobuf = 0;
if (*now_filled == 0) {
@ -8202,6 +8203,10 @@ again_one_more_time:
}
}
}
if (error != 0) {
/* try next net */
continue;
}
/************************/
/* Control transmission */
/************************/
@ -8436,7 +8441,7 @@ again_one_more_time:
sctp_move_chunks_from_net(stcb, net);
}
*reason_code = 7;
continue;
break;
} else
asoc->ifp_had_enobuf = 0;
/* Only HB or ASCONF advances time */
@ -8482,6 +8487,10 @@ again_one_more_time:
}
}
}
if (error != 0) {
/* try next net */
continue;
}
/* JRI: if dest is in PF state, do not send data to it */
if ((asoc->sctp_cmt_on_off > 0) &&
(net != stcb->asoc.alternate) &&