1 files changed, 7 insertions, 2 deletions

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 5f07ddb19554..dec68a604773 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -177,10 +177,10 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a
          * RFC 6 - A SCTP receiver MUST be able to receive a minimum of
          * 1500 bytes in one SCTP packet.
          */
-        if (sk->sk_rcvbuf < SCTP_DEFAULT_MINWINDOW)
+        if ((sk->sk_rcvbuf/2) < SCTP_DEFAULT_MINWINDOW)
                 asoc->rwnd = SCTP_DEFAULT_MINWINDOW;
         else
-                asoc->rwnd = sk->sk_rcvbuf;
+                asoc->rwnd = sk->sk_rcvbuf/2;
 
         asoc->a_rwnd = asoc->rwnd;
 
@@ -192,6 +192,9 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a
         /* Set the sndbuf size for transmit.  */
         asoc->sndbuf_used = 0;
 
+        /* Initialize the receive memory counter */
+        atomic_set(&asoc->rmem_alloc, 0);
+
         init_waitqueue_head(&asoc->wait);
 
         asoc->c.my_vtag = sctp_generate_tag(ep);
@@ -400,6 +403,8 @@ static void sctp_association_destroy(struct sctp_association *asoc)
                 spin_unlock_bh(&sctp_assocs_id_lock);
         }
 
+        BUG_TRAP(!atomic_read(&asoc->rmem_alloc));
+
         if (asoc->base.malloced) {
                 kfree(asoc);
                 SCTP_DBG_OBJCNT_DEC(assoc);