From 278be59abe7bc9164f38503305a3e83b8ad4879b Mon Sep 17 00:00:00 2001
From: Vlad Yasevich <vladislav.yasevich@hp.com>
Date: Fri, 18 Jul 2008 23:06:07 -0700
Subject: [PATCH] --- yaml --- r: 103645 b: refs/heads/master c:
 23b29ed80bd7184398317a111dc488605cb66c7f h: refs/heads/master i:   103643:
 c0e6df57194fdbbadf5d051f43f480fcf132281a v: v3

---
 [refs]                  | 2 +-
 trunk/net/sctp/socket.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 85f0798b72d7..bbcc9dc47602 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7dab83de50c7b2b7ceac695a0b56fa6c0f95b0bc
+refs/heads/master: 23b29ed80bd7184398317a111dc488605cb66c7f
diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c
index a0e879bb202d..fd7ed9d46a48 100644
--- a/trunk/net/sctp/socket.c
+++ b/trunk/net/sctp/socket.c
@@ -5773,7 +5773,7 @@ int sctp_inet_listen(struct socket *sock, int backlog)
 		goto out;
 
 	/* Allocate HMAC for generating cookie. */
-	if (sctp_hmac_alg) {
+	if (!sctp_sk(sk)->hmac && sctp_hmac_alg) {
 		tfm = crypto_alloc_hash(sctp_hmac_alg, 0, CRYPTO_ALG_ASYNC);
 		if (IS_ERR(tfm)) {
 			if (net_ratelimit()) {
@@ -5801,7 +5801,8 @@ int sctp_inet_listen(struct socket *sock, int backlog)
 		goto cleanup;
 
 	/* Store away the transform reference. */
-	sctp_sk(sk)->hmac = tfm;
+	if (!sctp_sk(sk)->hmac)
+		sctp_sk(sk)->hmac = tfm;
 out:
 	sctp_release_sock(sk);
 	return err;