sctp: fully initialize sctp_outq in sctp_outq_init
In commit 2f94aabd9f
(refactor sctp_outq_teardown to insure proper re-initalization)
we modified sctp_outq_teardown to use sctp_outq_init to fully re-initalize the
outq structure. Steve West recently asked me why I removed the q->error = 0
initalization from sctp_outq_teardown. I did so because I was operating under
the impression that sctp_outq_init would properly initalize that value for us,
but it doesn't. sctp_outq_init operates under the assumption that the outq
struct is all 0's (as it is when called from sctp_association_init), but using
it in __sctp_outq_teardown violates that assumption. We should do a memset in
sctp_outq_init to ensure that the entire structure is in a known state there
instead.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Reported-by: "West, Steve (NSN - US/Fort Worth)" <steve.west@nsn.com>
CC: Vlad Yasevich <vyasevich@gmail.com>
CC: netdev@vger.kernel.org
CC: davem@davemloft.net
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
aaf9522d62
commit
c5c7774d7e
1 changed files with 2 additions and 4 deletions
|
@ -206,6 +206,8 @@ static inline int sctp_cacc_skip(struct sctp_transport *primary,
|
|||
*/
|
||||
void sctp_outq_init(struct sctp_association *asoc, struct sctp_outq *q)
|
||||
{
|
||||
memset(q, 0, sizeof(struct sctp_outq));
|
||||
|
||||
q->asoc = asoc;
|
||||
INIT_LIST_HEAD(&q->out_chunk_list);
|
||||
INIT_LIST_HEAD(&q->control_chunk_list);
|
||||
|
@ -213,11 +215,7 @@ void sctp_outq_init(struct sctp_association *asoc, struct sctp_outq *q)
|
|||
INIT_LIST_HEAD(&q->sacked);
|
||||
INIT_LIST_HEAD(&q->abandoned);
|
||||
|
||||
q->fast_rtx = 0;
|
||||
q->outstanding_bytes = 0;
|
||||
q->empty = 1;
|
||||
q->cork = 0;
|
||||
q->out_qlen = 0;
|
||||
}
|
||||
|
||||
/* Free the outqueue structure and any related pending chunks.
|
||||
|
|
Loading…
Reference in a new issue