From: Adrian Vovk <adrianvovk@gmail.com>
Date: Tue, 1 Oct 2024 20:29:47 +0000 (+0200)
Subject: sd-stub: Fixup typo & measurement order
X-Git-Tag: v257-rc3~15^2~3
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=5a10a9a3bb18094bccaa835a40685984e22ba40a;p=systemd%2F.git

sd-stub: Fixup typo & measurement order

A previous commit accidentally reversed the measurement order of the
confext initrds and sysext initrds via a minor typo. This commit fixes
the typo and restores the original measurement order

Follow-up: ac32323
---

diff --git a/src/boot/stub.c b/src/boot/stub.c
index c92df686c8..cf990df2e7 100644
--- a/src/boot/stub.c
+++ b/src/boot/stub.c
@@ -858,7 +858,7 @@ static void generate_sidecar_initrds(
                       /* access_mode= */ 0444,
                       /* tpm_pcr= */ TPM2_PCR_SYSEXTS,
                       u"System extension initrd",
-                      initrds + INITRD_CONFEXT,
+                      initrds + INITRD_SYSEXT,
                       &m) == EFI_SUCCESS)
                 combine_measured_flag(sysext_measured, m);
 
@@ -871,7 +871,7 @@ static void generate_sidecar_initrds(
                       /* access_mode= */ 0444,
                       /* tpm_pcr= */ TPM2_PCR_KERNEL_CONFIG,
                       u"Configuration extension initrd",
-                      initrds + INITRD_SYSEXT,
+                      initrds + INITRD_CONFEXT,
                       &m) == EFI_SUCCESS)
                 combine_measured_flag(confext_measured, m);
 }