| Message ID | 1470306526-27219-7-git-send-email-t-kristo@ti.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Herbert Xu |
| Headers | show |
On Thu, Aug 04, 2016 at 01:28:41PM +0300, Tero Kristo wrote: > From: Lokesh Vutla <a0131933@ti.com> > > For cases where total length of an input SGs is not same as > length of the input data for encryption, omap-des driver > crashes. This happens in the case when IPsec is trying to use > omap-des driver. > > To avoid this, we copy all the pages from the input SG list > into a contiguous buffer and prepare a single element SG list > for this buffer with length as the total bytes to crypt, which is > similar thing that is done in case of unaligned lengths. Ugh, that means copying every single packet, right? So if it's just the SG list that's the problem, why don't you copy that instead? That is, allocate a new SG list and set it up so that there is no excess data. Cheers,
On 13/09/16 12:35, Herbert Xu wrote: > On Thu, Aug 04, 2016 at 01:28:41PM +0300, Tero Kristo wrote: >> From: Lokesh Vutla <a0131933@ti.com> >> >> For cases where total length of an input SGs is not same as >> length of the input data for encryption, omap-des driver >> crashes. This happens in the case when IPsec is trying to use >> omap-des driver. >> >> To avoid this, we copy all the pages from the input SG list >> into a contiguous buffer and prepare a single element SG list >> for this buffer with length as the total bytes to crypt, which is >> similar thing that is done in case of unaligned lengths. > > Ugh, that means copying every single packet, right? > > So if it's just the SG list that's the problem, why don't you > copy that instead? That is, allocate a new SG list and set it > up so that there is no excess data. > > Cheers, > I'll take a look at this. I have this kind of solution in place for the re-worked SHA driver, so can probably re-use it here. -Tero -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c index 5691434..d0b59f6 100644 --- a/drivers/crypto/omap-des.c +++ b/drivers/crypto/omap-des.c @@ -521,29 +521,36 @@ static int omap_des_crypt_dma_stop(struct omap_des_dev *dd) return 0; } -static int omap_des_copy_needed(struct scatterlist *sg) +static int omap_des_copy_needed(struct scatterlist *sg, int total) { + int len = 0; + + if (!IS_ALIGNED(total, DES_BLOCK_SIZE)) + return -1; + while (sg) { if (!IS_ALIGNED(sg->offset, 4)) return -1; if (!IS_ALIGNED(sg->length, DES_BLOCK_SIZE)) return -1; + + len += sg->length; sg = sg_next(sg); } + + if (len != total) + return -1; + return 0; } static int omap_des_copy_sgs(struct omap_des_dev *dd) { void *buf_in, *buf_out; - int pages; - - pages = dd->total >> PAGE_SHIFT; - - if (dd->total & (PAGE_SIZE-1)) - pages++; + int pages, total; - BUG_ON(!pages); + total = ALIGN(dd->total, DES_BLOCK_SIZE); + pages = get_order(total); buf_in = (void *)__get_free_pages(GFP_ATOMIC, pages); buf_out = (void *)__get_free_pages(GFP_ATOMIC, pages); @@ -605,8 +612,8 @@ static int omap_des_prepare_req(struct crypto_engine *engine, if (dd->out_sg_len < 0) return dd->out_sg_len; - if (omap_des_copy_needed(dd->in_sg) || - omap_des_copy_needed(dd->out_sg)) { + if (omap_des_copy_needed(dd->in_sg, dd->total) || + omap_des_copy_needed(dd->out_sg, dd->total)) { if (omap_des_copy_sgs(dd)) pr_err("Failed to copy SGs for unaligned cases\n"); dd->sgs_copied = 1;