Patch "crypto: af_alg - Fix socket double-free when accept fails" has been added to the 3.14-stable tree

Patch "crypto: af_alg - Fix socket double-free when accept fails" has been added to the 3.14-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    crypto: af_alg - Fix socket double-free when accept fails

to the 3.14-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     crypto-af_alg-fix-socket-double-free-when-accept-fails.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From a383292c86663bbc31ac62cc0c04fc77504636a6 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 30 Dec 2015 20:24:17 +0800
Subject: crypto: af_alg - Fix socket double-free when accept fails

From: Herbert Xu <herbert@gondor.apana.org.au>

commit a383292c86663bbc31ac62cc0c04fc77504636a6 upstream.

When we fail an accept(2) call we will end up freeing the socket
twice, once due to the direct sk_free call and once again through
newsock.

This patch fixes this by removing the sk_free call.

Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 crypto/af_alg.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -275,10 +275,8 @@ int af_alg_accept(struct sock *sk, struc
 	security_sk_clone(sk, sk2);
 
 	err = type->accept(ask->private, sk2);
-	if (err) {
-		sk_free(sk2);
+	if (err)
 		goto unlock;
-	}
 
 	sk2->sk_family = PF_ALG;
 


Patches currently in stable-queue which might be from herbert@gondor.apana.org.au are

queue-3.14/crypto-af_alg-disallow-bind-setkey-...-after-accept-2.patch
queue-3.14/crypto-algif_hash-only-export-and-import-on-sockets-with-data.patch
queue-3.14/crypto-af_alg-fix-socket-double-free-when-accept-fails.patch