2019-05-16 14:26:07

by Sascha Hauer

Subject: [PATCH] crypto: caam: print debugging hex dumps after unmapping

For encryption the destination pointer was still mapped, so the hex dump
may be wrong. The IV still contained the input IV while printing instead
of the output IV as intended.

For decryption the destination pointer was still mapped, so the hex dump
may be wrong. The IV dump was correct.

Do the hex dumps consistenly after the buffers have been unmapped and
in case of IV copied to their final destination.

Signed-off-by: Sascha Hauer <[email protected]>
---
drivers/crypto/caam/caamalg.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 3e23d4b2cce2..a992ff56fd15 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -1009,15 +1009,6 @@ static void skcipher_encrypt_done(struct device *jrdev, u32 *desc, u32 err,
if (err)
caam_jr_strstatus(jrdev, err);

-#ifdef DEBUG
- print_hex_dump(KERN_ERR, "dstiv @"__stringify(__LINE__)": ",
- DUMP_PREFIX_ADDRESS, 16, 4, req->iv,
- edesc->src_nents > 1 ? 100 : ivsize, 1);
-#endif
- caam_dump_sg(KERN_ERR, "dst @" __stringify(__LINE__)": ",
- DUMP_PREFIX_ADDRESS, 16, 4, req->dst,
- edesc->dst_nents > 1 ? 100 : req->cryptlen, 1);
-
skcipher_unmap(jrdev, edesc, req);

/*
@@ -1028,6 +1019,15 @@ static void skcipher_encrypt_done(struct device *jrdev, u32 *desc, u32 err,
scatterwalk_map_and_copy(req->iv, req->dst, req->cryptlen -
ivsize, ivsize, 0);

+#ifdef DEBUG
+ print_hex_dump(KERN_ERR, "dstiv @"__stringify(__LINE__)": ",
+ DUMP_PREFIX_ADDRESS, 16, 4, req->iv,
+ edesc->src_nents > 1 ? 100 : ivsize, 1);
+#endif
+ caam_dump_sg(KERN_ERR, "dst @" __stringify(__LINE__)": ",
+ DUMP_PREFIX_ADDRESS, 16, 4, req->dst,
+ edesc->dst_nents > 1 ? 100 : req->cryptlen, 1);
+
kfree(edesc);

skcipher_request_complete(req, err);
@@ -1049,6 +1049,8 @@ static void skcipher_decrypt_done(struct device *jrdev, u32 *desc, u32 err,
if (err)
caam_jr_strstatus(jrdev, err);

+ skcipher_unmap(jrdev, edesc, req);
+
#ifdef DEBUG
print_hex_dump(KERN_ERR, "dstiv @"__stringify(__LINE__)": ",
DUMP_PREFIX_ADDRESS, 16, 4, req->iv, ivsize, 1);
@@ -1057,7 +1059,6 @@ static void skcipher_decrypt_done(struct device *jrdev, u32 *desc, u32 err,
DUMP_PREFIX_ADDRESS, 16, 4, req->dst,
edesc->dst_nents > 1 ? 100 : req->cryptlen, 1);

- skcipher_unmap(jrdev, edesc, req);
kfree(edesc);

skcipher_request_complete(req, err);
--
2.20.1

2019-05-17 06:28:11

by Horia Geanta

Subject: Re: [PATCH] crypto: caam: print debugging hex dumps after unmapping

On 5/16/2019 5:24 PM, Sascha Hauer wrote:
> For encryption the destination pointer was still mapped, so the hex dump
> may be wrong. The IV still contained the input IV while printing instead
> of the output IV as intended.
>
> For decryption the destination pointer was still mapped, so the hex dump
> may be wrong. The IV dump was correct.
>
> Do the hex dumps consistenly after the buffers have been unmapped and
> in case of IV copied to their final destination.
>
> Signed-off-by: Sascha Hauer <[email protected]>
Reviewed-by: Horia Geant? <[email protected]>

Thanks,
Horia

2019-05-23 06:54:06

by Herbert Xu

Subject: Re: [PATCH] crypto: caam - print debugging hex dumps after unmapping

On Thu, May 16, 2019 at 04:24:42PM +0200, Sascha Hauer wrote:
> For encryption the destination pointer was still mapped, so the hex dump
> may be wrong. The IV still contained the input IV while printing instead
> of the output IV as intended.
>
> For decryption the destination pointer was still mapped, so the hex dump
> may be wrong. The IV dump was correct.
>
> Do the hex dumps consistenly after the buffers have been unmapped and
> in case of IV copied to their final destination.
>
> Signed-off-by: Sascha Hauer <[email protected]>
> Reviewed-by: Horia Geantă <[email protected]>
> ---
> drivers/crypto/caam/caamalg.c | 21 +++++++++++----------
> 1 file changed, 11 insertions(+), 10 deletions(-)

Patch applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt