diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-28 16:22:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-28 16:22:10 -0800 |
| commit | 43570f0383d6d5879ae585e6c3cf027ba321546f (patch) | |
| tree | daf5612c631585dbcaa426ccd38ac28308373537 /include/crypto | |
| parent | 43f462f1c2e111d2882b48baeeff774ae42e7c56 (diff) | |
| parent | c14ca8386539a298c1c19b003fe55e37d0f0e89c (diff) | |
| download | linux-43570f0383d6d5879ae585e6c3cf027ba321546f.tar.gz linux-43570f0383d6d5879ae585e6c3cf027ba321546f.tar.bz2 linux-43570f0383d6d5879ae585e6c3cf027ba321546f.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
- avoid potential bogus alignment for some AEAD operations
- fix crash in algif_aead
- avoid sleeping in softirq context with async af_alg
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: skcipher - Fix skcipher_walk_aead_common
crypto: af_alg - remove locking in async callback
crypto: algif_aead - skip SGL entries with NULL page
Diffstat (limited to 'include/crypto')
| -rw-r--r-- | include/crypto/if_alg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h index 6abf0a3604dc..38d9c5861ed8 100644 --- a/include/crypto/if_alg.h +++ b/include/crypto/if_alg.h @@ -242,6 +242,7 @@ int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size, unsigned int ivsize); ssize_t af_alg_sendpage(struct socket *sock, struct page *page, int offset, size_t size, int flags); +void af_alg_free_resources(struct af_alg_async_req *areq); void af_alg_async_cb(struct crypto_async_request *_req, int err); unsigned int af_alg_poll(struct file *file, struct socket *sock, poll_table *wait); |