[31/88] sctp: fully initialize sctp_outq in sctp_outq_init

From: Steven Rostedt
Date: Tue Aug 13 2013 - 12:06:52 EST stable review patch.
If anyone has any objections, please let me know.


From: Neil Horman <nhorman@xxxxxxxxxxxxx>

[ Upstream commit c5c7774d7eb4397891edca9ebdf750ba90977a69 ]

In commit 2f94aabd9f6c925d77aecb3ff020f1cc12ed8f86
(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

Signed-off-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Reported-by: "West, Steve (NSN - US/Fort Worth)" <steve.west@xxxxxxx>
CC: Vlad Yasevich <vyasevich@xxxxxxxxx>
CC: netdev@xxxxxxxxxxxxxxx
CC: davem@xxxxxxxxxxxxx
Acked-by: Vlad Yasevich <vyasevich@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
net/sctp/outqueue.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index e0902c9..d06b708 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -205,6 +205,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;
@@ -212,13 +214,9 @@ void sctp_outq_init(struct sctp_association *asoc, struct sctp_outq *q)

- q->fast_rtx = 0;
- q->outstanding_bytes = 0;
q->empty = 1;
- q->cork = 0;

q->malloced = 0;
- q->out_qlen = 0;

/* Free the outqueue structure and any related pending chunks.

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/