From edd5c4a4db3a008d972ff20fa95c550d9044300b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 6 May 2025 06:38:56 +0000 Subject: [PATCH] ANDROID: GKI: fix up crc issue in crypto_get_default_null_skcipher() In commit 0486de3c1b82 ("crypto: null - Use spin lock instead of mutex"), the .h files get shuffled around a bit, which causes a CRC mismatch in crypto_get_default_null_skcipher(). Add back mm.h to the build to keep the CRC calculations the same. Bug: 161946584 Fixes: 0486de3c1b82 ("crypto: null - Use spin lock instead of mutex") Change-Id: I7d1490944efbbd3bdc99e4116014b5f32ab3d708 Signed-off-by: Greg Kroah-Hartman --- crypto/crypto_null.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crypto/crypto_null.c b/crypto/crypto_null.c index 337867028653..276e987dc73e 100644 --- a/crypto/crypto_null.c +++ b/crypto/crypto_null.c @@ -18,6 +18,9 @@ #include #include #include +// CRC fix for e307c54ac819 ("crypto: null - Use spin lock instead of mutex") requires us to put +// back mm.h to preserve a bunch of structure types in the crc generation logic +#include #include static DEFINE_SPINLOCK(crypto_default_null_skcipher_lock);