[v2] crypto: caam - Avoid GCC memset bug warning

Commit Message

Herbert Xu Dec. 28, 2022, 11:03 a.m. UTC

On Wed, Dec 28, 2022 at 10:39:17AM +0100, Uwe Kleine-König wrote:
>
> Huh, broken encoding in the mail. I'd appreciate someone to doublecheck
> it's fine in the final commit.
> 
> Tested-by: Uwe Kleine-König <[e-mail]>

Sorry.  Let me try again:

---8<---
Certain versions of gcc don't like the memcpy with a NULL dst
(which only happens with a zero length).  This only happens
when debugging is enabled so add an if clause to work around
these warnings.

A similar warning used to be generated by sparse but that was
fixed years ago.

Link: https://lore.kernel.org/lkml/[e-mail]
Reported-by: kernel test robot <[e-mail]>
Reported-by: Kees Cook <[e-mail]>
Reported-by: Uwe Kleine-König <[e-mail]>
Tested-by: Uwe Kleine-König <[e-mail]>
Signed-off-by: Herbert Xu <[e-mail]>

Patch

diff --git a/drivers/crypto/caam/desc_constr.h b/drivers/crypto/caam/desc_constr.h
index 62ce6421bb3f..824c94d44f94 100644
--- a/drivers/crypto/caam/desc_constr.h
+++ b/drivers/crypto/caam/desc_constr.h
@@ -163,7 +163,8 @@  static inline void append_data(u32 * const desc, const void *data, int len)
 {
 	u32 *offset = desc_end(desc);
 
-	if (len) /* avoid sparse warning: memcpy with byte count of 0 */
+	/* Avoid gcc warning: memcpy with data == NULL */
+	if (!IS_ENABLED(CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG) || data)
 		memcpy(offset, data, len);
 
 	(*desc) = cpu_to_caam32(caam32_to_cpu(*desc) +