Use dce_base and dce_size in slparams

Signed-off-by: Ross Philipson <[email protected]>
TrenchBoot · Sep 21, 2022 · b0445fe · b0445fe
1 parent d84e48c
commit b0445fe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
@@ -803,8 +803,8 @@ grub_linux_boot (void)
 
       /* Configure relocator GETSEC[SENTER] call. */
       state.eax = GRUB_SMX_LEAF_SENTER;
-      state.ebx = slparams.sinit_acm_base;
-      state.ecx = slparams.sinit_acm_size;
+      state.ebx = slparams.dce_base;
+      state.ecx = slparams.dce_size;
       state.edx = 0;
     }
   else

diff --git a/grub-core/loader/i386/txt/txt.c b/grub-core/loader/i386/txt/txt.c
@@ -878,8 +878,8 @@ grub_txt_boot_prepare (struct grub_slaunch_params *slparams)
   mle_header->first_valid_page = 0;
   mle_header->mle_end = slparams->mle_size;
 
-  slparams->sinit_acm_base = (grub_uint32_t)(grub_addr_t) sinit_base;
-  slparams->sinit_acm_size = sinit_base->size * 4;
+  slparams->dce_base = (grub_uint32_t)(grub_addr_t) sinit_base;
+  slparams->dce_size = sinit_base->size * 4;
 
   grub_tpm_relinquish_lcl (0);
 

diff --git a/include/grub/i386/slaunch.h b/include/grub/i386/slaunch.h
@@ -45,8 +45,8 @@ struct grub_slaunch_params
   grub_uint32_t mle_header_offset;
   grub_uint32_t ap_wake_block;
   grub_uint32_t ap_wake_block_size;
-  grub_uint32_t sinit_acm_base;
-  grub_uint32_t sinit_acm_size;
+  grub_uint32_t dce_base;
+  grub_uint32_t dce_size;
   grub_uint64_t tpm_evt_log_base;
   grub_uint32_t tpm_evt_log_size;
 };