Commit bb992bc4 authored by Sascha Hauer's avatar Sascha Hauer Committed by Herbert Xu
Browse files

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: default avatarSascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 3e03e792

drivers/crypto/caam/caamalg.c

+11 −10
Original line number Diff line number Diff line
@@ -1010,15 +1010,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);



	/*
@@ -1029,6 +1020,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);
@@ -1050,6 +1050,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);
@@ -1058,7 +1060,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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE