From edd71f78dd0b2f9b61572e2a4ea2d751886fa1cb Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Thu, 7 Feb 2013 23:22:58 +0000 Subject: [PATCH] --- yaml --- r: 352381 b: refs/heads/master c: 03536e23acd3706c0ec93d01dc8bef44dab1a860 h: refs/heads/master i: 352379: 103fb2806dc5b11dd8aa787d73fa3426aca14cdf v: v3 --- [refs] | 2 +- trunk/net/sctp/auth.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 05cb714a0376..71b3272d9cfc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3807ff5899f892abb4f06747c245fd648a2acdc5 +refs/heads/master: 03536e23acd3706c0ec93d01dc8bef44dab1a860 diff --git a/trunk/net/sctp/auth.c b/trunk/net/sctp/auth.c index 94a12de58691..5ec7509bb2c9 100644 --- a/trunk/net/sctp/auth.c +++ b/trunk/net/sctp/auth.c @@ -209,12 +209,10 @@ static struct sctp_auth_bytes *sctp_auth_make_key_vector( len = random_len + hmacs_len + chunks_len; - new = kmalloc(sizeof(struct sctp_auth_bytes) + len, gfp); + new = sctp_auth_create_key(len, gfp); if (!new) return NULL; - new->len = len; - memcpy(new->data, random, random_len); offset += random_len; @@ -353,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; }