[PATCH 3.10 56/64] crypto: af_alg - Fix socket double-free when accept fails

From	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Newsgroups	linux.kernel
Subject	[PATCH 3.10 56/64] crypto: af_alg - Fix socket double-free when accept fails
Date	2016-02-15 00:40 +0100
Message-ID	<r2eqJ-1c5-1@gated-at.bofh.it> (permalink)
References	<r2dO1-Ir-9@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

3.10-stable review patch.  If anyone has any objections, please let me know.

------------------

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;

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 3.10 56/64] crypto: af_alg - Fix socket double-free when accept fails Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-02-15 00:40 +0100

csiph-web