redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

crypto: omap-sham - buffer handling fixes for hashing later 

Currently, the hash later code only handles the cases when we have
either new data coming in with the request or old data in the buffer,
but not the combination when we have both. Fix this by changing the
ordering of the code a bit and handling both cases properly
simultaneously if needed. Also, fix an issue with omap_sham_update
that surfaces with this fix, so that the code checks the bufcnt
instead of total data amount against buffer length to avoid any
buffer overflows.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
hifive-unleashed-5.1
Tero Kristo 2017-05-24 10:35:32 +03:00 committed by Herbert Xu
parent ad18cc9d0f
commit 5d78d57ede
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/crypto/omap-sham.c
View File

@ -874,14 +874,21 @@ static int omap_sham_prepare_request(struct ahash_request *req, bool update)
}
if (hash_later) {
if (req->nbytes) {
scatterwalk_map_and_copy(rctx->buffer, req->src,
req->nbytes - hash_later,
hash_later, 0);
} else {
int offset = 0;
if (hash_later > req->nbytes) {
memcpy(rctx->buffer, rctx->buffer + xmit_len,
hash_later);
hash_later - req->nbytes);
offset = hash_later - req->nbytes;
}
if (req->nbytes) {
scatterwalk_map_and_copy(rctx->buffer + offset,
req->src,
offset + req->nbytes -
hash_later, hash_later, 0);
}
rctx->bufcnt = hash_later;
} else {
rctx->bufcnt = 0;
@ -1190,11 +1197,10 @@ static int omap_sham_update(struct ahash_request *req)
if (!req->nbytes)
return 0;
if (ctx->total + req->nbytes < ctx->buflen) {
if (ctx->bufcnt + req->nbytes <= ctx->buflen) {
scatterwalk_map_and_copy(ctx->buffer + ctx->bufcnt, req->src,
0, req->nbytes, 0);
ctx->bufcnt += req->nbytes;
ctx->total += req->nbytes;
return 0;
}