|
@@ -554,15 +554,23 @@ static int omap_aes_crypt_dma_stop(struct omap_aes_dev *dd)
|
|
return err;
|
|
return err;
|
|
}
|
|
}
|
|
|
|
|
|
-static int omap_aes_check_aligned(struct scatterlist *sg)
|
|
|
|
|
|
+static int omap_aes_check_aligned(struct scatterlist *sg, int total)
|
|
{
|
|
{
|
|
|
|
+ int len = 0;
|
|
|
|
+
|
|
while (sg) {
|
|
while (sg) {
|
|
if (!IS_ALIGNED(sg->offset, 4))
|
|
if (!IS_ALIGNED(sg->offset, 4))
|
|
return -1;
|
|
return -1;
|
|
if (!IS_ALIGNED(sg->length, AES_BLOCK_SIZE))
|
|
if (!IS_ALIGNED(sg->length, AES_BLOCK_SIZE))
|
|
return -1;
|
|
return -1;
|
|
|
|
+
|
|
|
|
+ len += sg->length;
|
|
sg = sg_next(sg);
|
|
sg = sg_next(sg);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if (len != total)
|
|
|
|
+ return -1;
|
|
|
|
+
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -633,8 +641,8 @@ static int omap_aes_handle_queue(struct omap_aes_dev *dd,
|
|
dd->in_sg = req->src;
|
|
dd->in_sg = req->src;
|
|
dd->out_sg = req->dst;
|
|
dd->out_sg = req->dst;
|
|
|
|
|
|
- if (omap_aes_check_aligned(dd->in_sg) ||
|
|
|
|
- omap_aes_check_aligned(dd->out_sg)) {
|
|
|
|
|
|
+ if (omap_aes_check_aligned(dd->in_sg, dd->total) ||
|
|
|
|
+ omap_aes_check_aligned(dd->out_sg, dd->total)) {
|
|
if (omap_aes_copy_sgs(dd))
|
|
if (omap_aes_copy_sgs(dd))
|
|
pr_err("Failed to copy SGs for unaligned cases\n");
|
|
pr_err("Failed to copy SGs for unaligned cases\n");
|
|
dd->sgs_copied = 1;
|
|
dd->sgs_copied = 1;
|