diff options
| author | Phil Sutter <phil.sutter@viprinet.com> | 2011-05-05 15:29:06 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-05-11 15:06:22 +1000 |
| commit | 6ef84509f3d439ed2d43ea40080643efec37f54f (patch) | |
| tree | 9eb8760dc6ba6f9dd5a94238ca237962aa806e8b /drivers/crypto | |
| parent | 7759995c75ae0cbd4c861582908449f6b6208e7a (diff) | |
| download | kernel_samsung_smdk4412-6ef84509f3d439ed2d43ea40080643efec37f54f.tar.gz kernel_samsung_smdk4412-6ef84509f3d439ed2d43ea40080643efec37f54f.tar.bz2 kernel_samsung_smdk4412-6ef84509f3d439ed2d43ea40080643efec37f54f.zip | |
crypto: mv_cesa - make count_sgs() null-pointer proof
This also makes the dummy scatterlist in mv_hash_final() needless, so
drop it.
XXX: should this routine be made pulicly available? There are probably
other users with their own implementations.
Signed-off-by: Phil Sutter <phil.sutter@viprinet.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/mv_cesa.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c index d704ed0e7d3..3cf303ee3fe 100644 --- a/drivers/crypto/mv_cesa.c +++ b/drivers/crypto/mv_cesa.c @@ -133,7 +133,6 @@ struct mv_req_hash_ctx { int extra_bytes; /* unprocessed bytes in buffer */ enum hash_op op; int count_add; - struct scatterlist dummysg; }; static void compute_aes_dec_key(struct mv_ctx *ctx) @@ -482,7 +481,7 @@ static int count_sgs(struct scatterlist *sl, unsigned int total_bytes) int i = 0; size_t cur_len; - while (1) { + while (sl) { cur_len = sl[i].length; ++i; if (total_bytes > cur_len) @@ -711,10 +710,7 @@ static int mv_hash_update(struct ahash_request *req) static int mv_hash_final(struct ahash_request *req) { struct mv_req_hash_ctx *ctx = ahash_request_ctx(req); - /* dummy buffer of 4 bytes */ - sg_init_one(&ctx->dummysg, ctx->buffer, 4); - /* I think I'm allowed to do that... */ - ahash_request_set_crypt(req, &ctx->dummysg, req->result, 0); + mv_update_hash_req_ctx(ctx, 1, 0); return mv_handle_req(&req->base); } |