diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 14:23:43 -0500 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 14:23:43 -0500 |
| commit | 9892b7132473ef1391184868f277b40a81c533ff (patch) | |
| tree | 18bd97d2c9d8e9c3b80c425d43e4f9aab1838ddc /crypto | |
| parent | 350da32aea3838f2baf1d8855390c8f7a4a054e9 (diff) | |
| parent | 5d7a76acad403638f635c918cc63d1d44ffa4065 (diff) | |
Merge tag 'v4.9.57' into v4.9-rt
This is the 4.9.57 stable release
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/shash.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crypto/shash.c b/crypto/shash.c index a051541a4a17..4d8a671d1614 100644 --- a/crypto/shash.c +++ b/crypto/shash.c @@ -274,12 +274,14 @@ static int shash_async_finup(struct ahash_request *req) int shash_ahash_digest(struct ahash_request *req, struct shash_desc *desc) { - struct scatterlist *sg = req->src; - unsigned int offset = sg->offset; unsigned int nbytes = req->nbytes; + struct scatterlist *sg; + unsigned int offset; int err; - if (nbytes < min(sg->length, ((unsigned int)(PAGE_SIZE)) - offset)) { + if (nbytes && + (sg = req->src, offset = sg->offset, + nbytes < min(sg->length, ((unsigned int)(PAGE_SIZE)) - offset))) { void *data; data = kmap_atomic(sg_page(sg)); |