x86/purgatory: Return bool from verify_sha256_digest()
PATCH 1/1 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().
Signed-off-by Thorsten Blum <[email protected]>
--- arch/x86/purgatory/purgatory.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
arch/x86/purgatory/purgatory.c +4 -10
@@ -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)) ==0 ; }void purgatory (void ) { -int ret; - - ret =verify_sha256_digest (); -if (ret) { +if (!verify_sha256_digest ()) {/* loop forever */ for (;;) ;
arch/x86/purgatory/purgatory.c static int verify_sha256_digest(void) · line 38
Quoted 5 lines · Thorsten Blum
arch/x86/purgatory/purgatory.c +1
-4-if (memcmp (digest, purgatory_sha256_digest,sizeof (digest))) -return 1 ; - -return 0 ; +return memcmp (digest, purgatory_sha256_digest,sizeof (digest)) ==0 ;
Could you please write this as !memcmp()? The == 0 variant is quite a bad pattern for such a long line, as it's far easier to miss during review than a ! unary operator...
Just like here:
arch/x86/purgatory/purgatory.c static int verify_sha256_digest(void) · line 43
Quoted 1 line
arch/x86/purgatory/purgatory.c +1
-0+if (!verify_sha256_digest ()) {
Thanks,
Ingo