lkml.org 
[lkml]   [2013]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 17/22] sctp: fully initialize sctp_outq in sctp_outq_init
    Date
    3.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Neil Horman <nhorman@tuxdriver.com>

    [ 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
    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/sctp/outqueue.c | 8 ++------
    1 file changed, 2 insertions(+), 6 deletions(-)

    --- a/net/sctp/outqueue.c
    +++ b/net/sctp/outqueue.c
    @@ -205,6 +205,8 @@ static inline int sctp_cacc_skip(struct
    */
    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);
    @@ -212,13 +214,7 @@ void sctp_outq_init(struct sctp_associat
    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->malloced = 0;
    - q->out_qlen = 0;
    }

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



    \
     
     \ /
      Last update: 2013-08-09 05:01    [W:2.973 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site