diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-14 22:49:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-14 22:49:50 -0700 |
| commit | dcf903d0c9adf003f664446bfc392034272b3071 (patch) | |
| tree | f9133a14d4dceadc734d556eb7953f8748448d4f /crypto | |
| parent | 96d0d831a50054bf3fb032fba4bc65006530e362 (diff) | |
| parent | b8fc3397c9e88dc7889b56395d04c1f3d65d186f (diff) | |
| download | linux-dcf903d0c9adf003f664446bfc392034272b3071.tar.gz linux-dcf903d0c9adf003f664446bfc392034272b3071.tar.bz2 linux-dcf903d0c9adf003f664446bfc392034272b3071.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
- fix new compiler warnings in cavium
- set post-op IV properly in caam (this fixes chaining)
- fix potential use-after-free in atmel in case of EBUSY
- fix sleeping in softirq path in chcr
- disable buggy sha1-avx2 driver (may overread and page fault)
- fix use-after-free on signals in caam
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: cavium - make several functions static
crypto: chcr - Avoid algo allocation in softirq.
crypto: caam - properly set IV after {en,de}crypt
crypto: atmel - only treat EBUSY as transient if backlog
crypto: af_alg - Avoid sock_graft call warning
crypto: caam - fix signals handling
crypto: sha1-ssse3 - Disable avx2
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/af_alg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 3556d8eb54a7..92a3d540d920 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -287,7 +287,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock, bool kern) goto unlock; sock_init_data(newsock, sk2); - sock_graft(sk2, newsock); + security_sock_graft(sk2, newsock); security_sk_clone(sk, sk2); err = type->accept(ask->private, sk2); |