diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-10-10 12:43:03 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-10-10 12:43:03 -0700 |
| commit | 09f6247a9ccaffcc9af1e4a9038e14ecdb76a79d (patch) | |
| tree | f28f9f114c1aab70185f424ec2be689d1e6cbd3b /crypto/blkcipher.c | |
| parent | 8760f8e3d9806a940d759c9e12fff7eb7130b9ab (diff) | |
| parent | d19e48fe5da7b83d02ed4aec3567f08ae02a168c (diff) | |
Merge tag 'v4.4.23' into android-4.4.y
This is the 4.4.23 stable release
Diffstat (limited to 'crypto/blkcipher.c')
| -rw-r--r-- | crypto/blkcipher.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c index 8cc1622b2ee0..dca7bc87dad9 100644 --- a/crypto/blkcipher.c +++ b/crypto/blkcipher.c @@ -234,6 +234,8 @@ static int blkcipher_walk_next(struct blkcipher_desc *desc, return blkcipher_walk_done(desc, walk, -EINVAL); } + bsize = min(walk->walk_blocksize, n); + walk->flags &= ~(BLKCIPHER_WALK_SLOW | BLKCIPHER_WALK_COPY | BLKCIPHER_WALK_DIFF); if (!scatterwalk_aligned(&walk->in, walk->alignmask) || @@ -246,7 +248,6 @@ static int blkcipher_walk_next(struct blkcipher_desc *desc, } } - bsize = min(walk->walk_blocksize, n); n = scatterwalk_clamp(&walk->in, n); n = scatterwalk_clamp(&walk->out, n); |