summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2015-12-30 13:24:17 +0100
committerHerbert Xu <herbert@gondor.apana.org.au>2016-01-18 11:16:10 +0100
commita383292c86663bbc31ac62cc0c04fc77504636a6 (patch)
treedbc55e2abd13c348dfe6aac886102b5bb3293bed /crypto
parentcrypto: af_alg - Disallow bind/setkey/... after accept(2) (diff)
downloadlinux-a383292c86663bbc31ac62cc0c04fc77504636a6.tar.xz
linux-a383292c86663bbc31ac62cc0c04fc77504636a6.zip
crypto: af_alg - Fix socket double-free when accept fails
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. Cc: stable@vger.kernel.org Reported-by: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/af_alg.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 7b5b5926c767..eaf98e287d89 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -285,10 +285,8 @@ int af_alg_accept(struct sock *sk, struct socket *newsock)
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;