[PATCH 3.14 67/76] crypto: af_alg - Fix socket double-free when accept fails

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Newsgroups	linux.kernel
Subject	[PATCH 3.14 67/76] crypto: af_alg - Fix socket double-free when accept fails
Date	Mon, 15 Feb 2016 00:20:04 +0100
Message-ID	<r2e7q-154-67@gated-at.bofh.it> (permalink)
References	<r2dO2-Ir-25@gated-at.bofh.it>
X-Mailer	git-send-email 2.7.1
User-Agent	quilt/0.64
MIME-Version	1.0
Content-Type	text/plain; charset=UTF-8
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	36
Organization	linux.* mail to news gateway
X-Original-Cc	Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Dmitry Vyukov <dvyukov@google.com>, Herbert Xu <herbert@gondor.apana.org.au>
X-Original-Date	Sun, 14 Feb 2016 14:23:34 -0800
X-Original-Message-ID	<20160214222221.351528564@linuxfoundation.org>
X-Original-References	<20160214222218.658495779@linuxfoundation.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1333777

Show key headers only | View raw

3.14-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.14 67/76] crypto: af_alg - Fix socket double-free when accept fails Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-02-15 00:20 +0100

csiph-web