1 files changed, 15 insertions, 14 deletions

diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index d8420ae614dc..ba1dfc3f8def 100644
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -200,27 +200,28 @@ static struct sctp_auth_bytes *sctp_auth_make_key_vector(
         struct sctp_auth_bytes *new;
         __u32   len;
         __u32   offset = 0;
+        __u16   random_len, hmacs_len, chunks_len = 0;
 
-        len = ntohs(random->param_hdr.length) + ntohs(hmacs->param_hdr.length);
-        if (chunks)
-                len += ntohs(chunks->param_hdr.length);
+        random_len = ntohs(random->param_hdr.length);
+        hmacs_len = ntohs(hmacs->param_hdr.length);
+        if (chunks)
+                chunks_len = ntohs(chunks->param_hdr.length);
 
-        new = kmalloc(sizeof(struct sctp_auth_bytes) + len, gfp);
+        len = random_len + hmacs_len + chunks_len;
+
+        new = sctp_auth_create_key(len, gfp);
         if (!new)
                 return NULL;
 
-        new->len = len;
-
-        memcpy(new->data, random, ntohs(random->param_hdr.length));
-        offset += ntohs(random->param_hdr.length);
+        memcpy(new->data, random, random_len);
+        offset += random_len;
 
         if (chunks) {
-                memcpy(new->data + offset, chunks,
-                        ntohs(chunks->param_hdr.length));
-                offset += ntohs(chunks->param_hdr.length);
+                memcpy(new->data + offset, chunks, chunks_len);
+                offset += chunks_len;
         }
 
-        memcpy(new->data + offset, hmacs, ntohs(hmacs->param_hdr.length));
+        memcpy(new->data + offset, hmacs, hmacs_len);
 
         return new;
 }
@@ -350,8 +351,8 @@ static struct sctp_auth_bytes *sctp_auth_asoc_create_secret(
         secret = sctp_auth_asoc_set_secret(ep_key, first_vector, last_vector,
                                             gfp);
 out:
-        kfree(local_key_vector);
-        kfree(peer_key_vector);
+        sctp_auth_key_put(local_key_vector);
+        sctp_auth_key_put(peer_key_vector);
 
         return secret;
 }