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:22:41 -0800 |
| commit | f77597b2ef65757d6e24daf96eb58446dfb83491 (patch) | |
| tree | 2b4e6a50b4f2de44da0dd198df34e558a409ff76 | |
| parent | 5a707f0972e1c9d8a4a921ddae79d0f9dc36a341 (diff) | |
| download | lwn-f77597b2ef65757d6e24daf96eb58446dfb83491.tar.gz lwn-f77597b2ef65757d6e24daf96eb58446dfb83491.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 d7fefeb3d1a7..0ca108f3c840 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -275,10 +275,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; |