Commit a9befcf4 authored by Tero Kristo's avatar Tero Kristo Committed by Herbert Xu

crypto: omap-aes-gcm - fix corner case with only auth data

Fix a corner case where only authdata is generated, without any provided
assocdata / cryptdata. Passing the empty scatterlists to OMAP AES core driver
in this case would confuse it, failing to map DMAs.
Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2b352489
...@@ -148,12 +148,14 @@ static int omap_aes_gcm_copy_buffers(struct omap_aes_dev *dd, ...@@ -148,12 +148,14 @@ static int omap_aes_gcm_copy_buffers(struct omap_aes_dev *dd,
if (req->src == req->dst || dd->out_sg == sg_arr) if (req->src == req->dst || dd->out_sg == sg_arr)
flags |= OMAP_CRYPTO_FORCE_COPY; flags |= OMAP_CRYPTO_FORCE_COPY;
if (cryptlen) {
ret = omap_crypto_align_sg(&dd->out_sg, cryptlen, ret = omap_crypto_align_sg(&dd->out_sg, cryptlen,
AES_BLOCK_SIZE, &dd->out_sgl, AES_BLOCK_SIZE, &dd->out_sgl,
flags, flags,
FLAGS_OUT_DATA_ST_SHIFT, &dd->flags); FLAGS_OUT_DATA_ST_SHIFT, &dd->flags);
if (ret) if (ret)
return ret; return ret;
}
dd->in_sg_len = sg_nents_for_len(dd->in_sg, alen + clen); dd->in_sg_len = sg_nents_for_len(dd->in_sg, alen + clen);
dd->out_sg_len = sg_nents_for_len(dd->out_sg, clen); dd->out_sg_len = sg_nents_for_len(dd->out_sg, clen);
...@@ -287,8 +289,12 @@ static int omap_aes_gcm_handle_queue(struct omap_aes_dev *dd, ...@@ -287,8 +289,12 @@ static int omap_aes_gcm_handle_queue(struct omap_aes_dev *dd,
return err; return err;
err = omap_aes_write_ctrl(dd); err = omap_aes_write_ctrl(dd);
if (!err) if (!err) {
if (dd->in_sg_len && dd->out_sg_len)
err = omap_aes_crypt_dma_start(dd); err = omap_aes_crypt_dma_start(dd);
else
omap_aes_gcm_dma_out_callback(dd);
}
if (err) { if (err) {
omap_aes_gcm_finish_req(dd, err); omap_aes_gcm_finish_req(dd, err);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment