diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-12-30 20:24:17 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-19 14:28:35 -0800 |
| commit | 9a9fcb9cd1e0ce7df2729e1ab7a95ccdff2322ae (patch) | |
| tree | da5192119f98fbf28fdc7b10e794f627769b4c5b | |
| parent | 44566ad6cb5d72f5018443923d66b30e86765080 (diff) | |
| download | linux-stable-9a9fcb9cd1e0ce7df2729e1ab7a95ccdff2322ae.tar.gz linux-stable-9a9fcb9cd1e0ce7df2729e1ab7a95ccdff2322ae.tar.bz2 linux-stable-9a9fcb9cd1e0ce7df2729e1ab7a95ccdff2322ae.zip | |
crypto: af_alg - Fix socket double-free when accept fails
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>
| -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 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; |