diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-12-30 20:24:17 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-18 18:16:10 +0800 |
commit | 21720b3ea4d374faaa77a1bf94a700515125301d (patch) | |
tree | c2e6790af3a4bf19911e352e00a1a1de406e9235 /crypto | |
parent | 796caacfda1cea522bd0b442b37a6a9286500487 (diff) | |
download | linux-crypto-21720b3ea4d374faaa77a1bf94a700515125301d.tar.gz linux-crypto-21720b3ea4d374faaa77a1bf94a700515125301d.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.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 7b5b5926..eaf98e28 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; |