1 files changed, 12 insertions, 2 deletions

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 556c495c6922..4fe1d6c863b1 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -1275,7 +1275,12 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep,
         unsigned int keylen;
         char *key;
 
-        headersize = sizeof(sctp_paramhdr_t) + SCTP_SECRET_SIZE;
+        /* Header size is static data prior to the actual cookie, including
+         * any padding.
+         */
+        headersize = sizeof(sctp_paramhdr_t) + 
+                     (sizeof(struct sctp_signed_cookie) - 
+                      sizeof(struct sctp_cookie));
         bodysize = sizeof(struct sctp_cookie)
                 + ntohs(init_chunk->chunk_hdr->length) + addrs_len;
 
@@ -1362,7 +1367,12 @@ struct sctp_association *sctp_unpack_cookie(
         struct sk_buff *skb = chunk->skb;
         struct timeval tv;
 
-        headersize = sizeof(sctp_chunkhdr_t) + SCTP_SECRET_SIZE;
+        /* Header size is static data prior to the actual cookie, including
+         * any padding.
+         */
+        headersize = sizeof(sctp_chunkhdr_t) +
+                     (sizeof(struct sctp_signed_cookie) - 
+                      sizeof(struct sctp_cookie));
         bodysize = ntohs(chunk->chunk_hdr->length) - headersize;
         fixed_size = headersize + sizeof(struct sctp_cookie);