From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-183.mta0.migadu.com (out-183.mta0.migadu.com [91.218.175.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7E84D37D11F for ; Sat, 9 May 2026 07:39:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.183 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778312358; cv=none; b=ALIIK78cqLI8rpCrgbBhdA55q9bP+1qz3T/DadniZw0/BRQOdq9lmcLxtCD+q+/oRccsGxYKQqjGyTWvoDX874brB0YSuxAAQMwWrrGiW7tZaZVYOJnCUABVy4uq2qUNHtCv4wQ6HnOREHFIVKFtBPVLuj+oy2++hYNB7VBFmJA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778312358; c=relaxed/simple; bh=dOLgFJTy8JLvzmSFaoqYz9sOLYJWoxubaDRMCBGo53o=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=NVHQiboYGpHYR06RcbXuTWDQU9KL/EDG7TEbrR2E0KP1UDEX2SbyMTmvWJ90tNdAxFbuzpg2KI6NRMfoyTv1XNg8EnRECxr3c9TPZ9i6eU5c3HUE/K6sdcOHc9XE/K/o5fTZXDUhrg2rltezffx1RvCEEFYgxD7/Bi3ED3ezRE0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=niXtNgIb; arc=none smtp.client-ip=91.218.175.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="niXtNgIb" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1778312354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ALn5vWljU/fPoLd3GB3xTWUGvCIhsExGeZzm58DpKd8=; b=niXtNgIb1fwJv67QgDcBsYweRVno2efsohmmToE/zL5hB6/hVCFaU0ScPUkugzVXypjhdh 04N/WxNVPPE1+o5Hk1S5efQ2aU37IBdeQRzhWz0zeUykjqvzyxcMMq2wYTMZeQNNFjN6OC QOKN49K6vEiEtjDQipcuo9jjHGLh34Y= From: Thorsten Blum To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Ard Biesheuvel , Eric Biggers Cc: Thorsten Blum , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] riscv/purgatory: return bool from verify_sha256_digest Date: Sat, 9 May 2026 09:38:50 +0200 Message-ID: <20260509073850.44595-3-thorsten.blum@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1854; i=thorsten.blum@linux.dev; h=from:subject; bh=dOLgFJTy8JLvzmSFaoqYz9sOLYJWoxubaDRMCBGo53o=; b=kA0DAAoWXqtxINjMdS4ByyZiAGn+5Iqi3Xr1UsOQUCDC7zLRW87jrBcNtohW3o0Kf6QLGaeKY Yh1BAAWCgAdFiEE4Jr4mE11fHmyNFi5XqtxINjMdS4FAmn+5IoACgkQXqtxINjMdS5qsgD/TFGy wUNyXrSnEtJQq9svFIJlxL6+nq0bbyx2OgRIohIBAIYwKUfk8DNN30v4QcQnqUafZQhWZtn39sX MCB5uc4wJ X-Developer-Key: i=thorsten.blum@linux.dev; a=openpgp; fpr=1D60735E8AEF3BE473B69D84733678FD8DFEEAD4 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT 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. Signed-off-by: Thorsten Blum --- Changes in v2: - Return true on success and false on failure (Eric) - v1: https://lore.kernel.org/lkml/20260412194113.228703-4-thorsten.blum@linux.dev/ --- arch/riscv/purgatory/purgatory.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/riscv/purgatory/purgatory.c b/arch/riscv/purgatory/purgatory.c index bbd5cfa4d741..745deeb6e3a5 100644 --- a/arch/riscv/purgatory/purgatory.c +++ b/arch/riscv/purgatory/purgatory.c @@ -17,7 +17,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; struct sha256_ctx sctx; @@ -26,11 +26,10 @@ static int verify_sha256_digest(void) sha256_init(&sctx); 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)) != 0) - return 1; - return 0; + + return memcmp(digest, purgatory_sha256_digest, sizeof(digest)) == 0; } /* workaround for a warning with -Wmissing-prototypes */ @@ -38,7 +37,7 @@ void purgatory(void); void purgatory(void) { - if (verify_sha256_digest()) + if (!verify_sha256_digest()) for (;;) /* loop forever */ ;