diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-12-30 20:24:17 +0800 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-02-03 16:23:18 -0500 |
| commit | fa988b35c2e40f38e57388a1a3f48de056e81dd3 (patch) | |
| tree | b0057b41a3a2d4513e0dc07b44543689370af77f /crypto | |
| parent | 0571ba52a19e18a1c20469454231eef681cb1310 (diff) | |
crypto: af_alg - Fix socket double-free when accept fails
[ Upstream commit a383292c86663bbc31ac62cc0c04fc77504636a6 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
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 2cf64ae17aa8..153dc85e04f1 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -282,10 +282,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; |