From 10a357ce443dad3ec985506485c6b37d34c382f2 Mon Sep 17 00:00:00 2001 From: Thorsten Blum Date: Thu, 23 Jul 2026 15:36:34 +0200 Subject: [PATCH] x86/purgatory: Return bool from verify_sha256_digest() Change the function's return type from 'int' to 'bool' and return the result of memcmp() directly to simplify the code. While at it, cast ->start to const u8 * to better match the expected type. Also inline the verify_sha256_digest() check and remove the redundant local 'ret' variable in purgatory(). No change in functionality expected. Signed-off-by: Thorsten Blum Signed-off-by: Ingo Molnar Cc: "H. Peter Anvin" Link: https://patch.msgid.link/20260723133634.161598-3-thorsten.blum@linux.dev --- arch/x86/purgatory/purgatory.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/x86/purgatory/purgatory.c b/arch/x86/purgatory/purgatory.c index 655139dd0532..45836aca1a4b 100644 --- a/arch/x86/purgatory/purgatory.c +++ b/arch/x86/purgatory/purgatory.c @@ -21,7 +21,7 @@ u8 purgatory_sha256_digest[SHA256_DIGEST_SIZE] __section(".kexec-purgatory"); struct kexec_sha_region purgatory_sha_regions[KEXEC_SEGMENT_MAX] __section(".kexec-purgatory"); -static int verify_sha256_digest(void) +static bool verify_sha256_digest(void) { struct kexec_sha_region *ptr, *end; u8 digest[SHA256_DIGEST_SIZE]; @@ -31,22 +31,16 @@ static int verify_sha256_digest(void) end = purgatory_sha_regions + ARRAY_SIZE(purgatory_sha_regions); for (ptr = purgatory_sha_regions; ptr < end; ptr++) - sha256_update(&sctx, (uint8_t *)(ptr->start), ptr->len); + sha256_update(&sctx, (const u8 *)(ptr->start), ptr->len); sha256_final(&sctx, digest); - if (memcmp(digest, purgatory_sha256_digest, sizeof(digest))) - return 1; - - return 0; + return !memcmp(digest, purgatory_sha256_digest, sizeof(digest)); } void purgatory(void) { - int ret; - - ret = verify_sha256_digest(); - if (ret) { + if (!verify_sha256_digest()) { /* loop forever */ for (;;) ;