crypto: caam - fix DMA API mapping leak

caamhash contains this weird code:

	src_nents = sg_count(req->src, req->nbytes);
	dma_map_sg(jrdev, req->src, src_nents ? : 1, DMA_TO_DEVICE);
	...
	edesc->src_nents = src_nents;

sg_count() returns zero when sg_nents_for_len() returns zero or one.
This means we don't need to use a hardware scatterlist.  However,
setting src_nents to zero causes problems when we unmap:

	if (edesc->src_nents)
		dma_unmap_sg_chained(dev, req->src, edesc->src_nents,
				     DMA_TO_DEVICE, edesc->chained);

as zero here means that we have no entries to unmap.  This causes us
to leak DMA mappings, where we map one scatterlist entry and then
fail to unmap it.

This can be fixed in two ways: either by writing the number of entries
that were requested of dma_map_sg(), or by reworking the "no SG
required" case.

We adopt the re-work solution here - we replace sg_count() with
sg_nents_for_len(), so src_nents now contains the real number of
scatterlist entries, and we then change the test for using the
hardware scatterlist to src_nents > 1 rather than just non-zero.

This change passes my sshd, openssl tests hashing /bin and tcrypt
tests.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
index 36365b3efdfdce5ffb6bc19a8b72fe31a3a463b3..24acd52b222e4e74dae377695f4e33dfe9147566 100644 (file)
--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -1094,13 +1094,16 @@ static int ahash_digest(struct ahash_request *req)
        u32 options;
        int sh_len;
 
-       src_nents = sg_count(req->src, req->nbytes);
+       src_nents = sg_nents_for_len(req->src, req->nbytes);
        if (src_nents < 0) {
                dev_err(jrdev, "Invalid number of src SG.\n");
                return src_nents;
        }
-       dma_map_sg(jrdev, req->src, src_nents ? : 1, DMA_TO_DEVICE);
-       sec4_sg_bytes = src_nents * sizeof(struct sec4_sg_entry);
+       dma_map_sg(jrdev, req->src, src_nents, DMA_TO_DEVICE);
+       if (src_nents > 1)
+               sec4_sg_bytes = src_nents * sizeof(struct sec4_sg_entry);
+       else
+               sec4_sg_bytes = 0;
 
        /* allocate space for base edesc and hw desc commands, link tables */
        edesc = kzalloc(sizeof(*edesc) + sec4_sg_bytes + DESC_JOB_IO_LEN,
@@ -1118,7 +1121,7 @@ static int ahash_digest(struct ahash_request *req)
        desc = edesc->hw_desc;
        init_job_desc_shared(desc, ptr, sh_len, HDR_SHARE_DEFER | HDR_REVERSE);
 
-       if (src_nents) {
+       if (src_nents > 1) {
                sg_to_sec4_sg_last(req->src, src_nents, edesc->sec4_sg, 0);
                edesc->sec4_sg_dma = dma_map_single(jrdev, edesc->sec4_sg,
                                            sec4_sg_bytes, DMA_TO_DEVICE);
@@ -1246,7 +1249,7 @@ static int ahash_update_no_ctx(struct ahash_request *req)
 
        if (to_hash) {
                src_nents = sg_nents_for_len(req->src,
-                                            req->nbytes - (*next_buflen));
+                                            req->nbytes - *next_buflen);
                if (src_nents < 0) {
                        dev_err(jrdev, "Invalid number of src SG.\n");
                        return src_nents;
@@ -1450,13 +1453,18 @@ static int ahash_update_first(struct ahash_request *req)
        to_hash = req->nbytes - *next_buflen;
 
        if (to_hash) {
-               src_nents = sg_count(req->src, req->nbytes - (*next_buflen));
+               src_nents = sg_nents_for_len(req->src,
+                                            req->nbytes - *next_buflen);
                if (src_nents < 0) {
                        dev_err(jrdev, "Invalid number of src SG.\n");
                        return src_nents;
                }
-               dma_map_sg(jrdev, req->src, src_nents ? : 1, DMA_TO_DEVICE);
-               sec4_sg_bytes = src_nents * sizeof(struct sec4_sg_entry);
+               dma_map_sg(jrdev, req->src, src_nents, DMA_TO_DEVICE);
+               if (src_nents > 1)
+                       sec4_sg_bytes = src_nents *
+                                       sizeof(struct sec4_sg_entry);
+               else
+                       sec4_sg_bytes = 0;
 
                /*
                 * allocate space for base edesc and hw desc commands,
@@ -1476,7 +1484,7 @@ static int ahash_update_first(struct ahash_request *req)
                                 DESC_JOB_IO_LEN;
                edesc->dst_dma = 0;
 
-               if (src_nents) {
+               if (src_nents > 1) {
                        sg_to_sec4_sg_last(req->src, src_nents,
                                           edesc->sec4_sg, 0);
                        edesc->sec4_sg_dma = dma_map_single(jrdev,