projects
/
GitHub
/
LineageOS
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c840ac6
)
crypto: af_alg - Fix socket double-free when accept fails
author
Herbert Xu
<herbert@gondor.apana.org.au>
Wed, 30 Dec 2015 12:24:17 +0000
(20:24 +0800)
committer
Herbert Xu
<herbert@gondor.apana.org.au>
Mon, 18 Jan 2016 10:16:10 +0000
(18:16 +0800)
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>
crypto/af_alg.c
patch
|
blob
|
blame
|
history
diff --git
a/crypto/af_alg.c
b/crypto/af_alg.c
index 7b5b5926c767204cb1f851f3e4c069fb07867804..eaf98e287d89ed8843b3141ef8c84bd11b3ee7a5 100644
(file)
--- 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;