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 /crypto/skcipher.c | |
| 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 'crypto/skcipher.c')
| -rw-r--r-- | crypto/skcipher.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/skcipher.c b/crypto/skcipher.c index d5692e35fab1..778e0ff42bfa 100644 --- a/crypto/skcipher.c +++ b/crypto/skcipher.c @@ -522,6 +522,9 @@ static int skcipher_walk_aead_common(struct skcipher_walk *walk, scatterwalk_copychunks(NULL, &walk->in, req->assoclen, 2); scatterwalk_copychunks(NULL, &walk->out, req->assoclen, 2); + scatterwalk_done(&walk->in, 0, walk->total); + scatterwalk_done(&walk->out, 0, walk->total); + walk->iv = req->iv; walk->oiv = req->iv; |