Skip to content

Commit

Permalink
crypto: af_alg - Fix socket double-free when accept fails
Browse files Browse the repository at this point in the history
[ Upstream commit a383292 ]

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>
  • Loading branch information
Herbert Xu authored and Sasha Levin committed Feb 10, 2016
1 parent f857638 commit ac9c75f
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions crypto/af_alg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit ac9c75f

Please sign in to comment.