projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usb: dwc3: rockchip: fix possible circular deadlock
[firefly-linux-kernel-4.4.55.git]
/
crypto
/
blkcipher.c
diff --git
a/crypto/blkcipher.c
b/crypto/blkcipher.c
index 8cc1622b2ee008ef7f5ff31a3ea7d8777f3f5f1b..dca7bc87dad9d326e39d44d1b62baad5006460da 100644
(file)
--- 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);
}
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) ||
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);
n = scatterwalk_clamp(&walk->in, n);
n = scatterwalk_clamp(&walk->out, n);