-
-
Notifications
You must be signed in to change notification settings - Fork 13
/
Copy path1119-multiboot2-Implement-TXT-slaunch-support.patch
373 lines (350 loc) · 13.1 KB
/
1119-multiboot2-Implement-TXT-slaunch-support.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
From 58c9a06983cb68f04548713208b25c0b579b4043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= <[email protected]>
Date: Thu, 1 Sep 2022 17:58:53 +0200
Subject: [PATCH] multiboot2: Implement TXT slaunch support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The code makes sure that MBI entry goes first in DRTM, so the payload
can measure it first on launch.
SLRT table is allocated on the heap first, size for it is reserved
inside TXT heap by TXT code and data is later copied into its final
place.
Signed-off-by: Sergii Dmytruk <[email protected]>
Signed-off-by: Michał Żygowski <[email protected]>
Signed-off-by: Tomasz Żyjewski <[email protected]>
Signed-off-by: Krystian Hebel <[email protected]>
---
grub-core/loader/multiboot.c | 23 ++++++-
grub-core/loader/multiboot_elfxx.c | 104 ++++++++++++++++++++++++++---
grub-core/loader/multiboot_mbi2.c | 99 +++++++++++++++++++++++++++
include/grub/multiboot2.h | 2 +
4 files changed, 219 insertions(+), 9 deletions(-)
diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
index 07173f60e7c4..17a922be2a16 100644
--- a/grub-core/loader/multiboot.c
+++ b/grub-core/loader/multiboot.c
@@ -52,6 +52,7 @@
#include <grub/i18n.h>
#if defined (__i386__) || defined (__x86_64__)
#include <grub/i386/slaunch.h>
+#include <grub/i386/txt.h>
#endif
GRUB_MOD_LICENSE ("GPLv3+");
@@ -164,7 +165,17 @@ efi_boot (struct grub_relocator *rel __attribute__ ((unused)),
static void
normal_boot (struct grub_relocator *rel, struct grub_relocator32_state state)
{
- state.edi = SLP_NONE;
+ struct grub_slaunch_params *slparams = grub_slaunch_params();
+ state.edi = grub_slaunch_platform_type ();
+
+ if (state.edi == SLP_INTEL_TXT)
+ {
+ /* Configure relocator GETSEC[SENTER] call. */
+ state.eax = GRUB_SMX_LEAF_SENTER;
+ state.ebx = slparams->dce_base;
+ state.ecx = slparams->dce_size;
+ state.edx = 0;
+ }
grub_relocator32_boot (rel, state, 0);
}
@@ -194,6 +205,16 @@ grub_multiboot_boot (void)
if (err)
return err;
+#ifdef GRUB_USE_MULTIBOOT2
+ if (grub_slaunch_platform_type () == SLP_INTEL_TXT)
+ {
+ err = grub_multiboot2_prepare_slaunch_txt (state.MULTIBOOT_MBI_REGISTER,
+ mbi_size);
+ if (err)
+ return err;
+ }
+#endif
+
if (grub_efi_is_finished)
normal_boot (GRUB_MULTIBOOT (relocator), state);
else
diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c
index f2318e0d165d..438cedc2c096 100644
--- a/grub-core/loader/multiboot_elfxx.c
+++ b/grub-core/loader/multiboot_elfxx.c
@@ -34,6 +34,8 @@
#error "I'm confused"
#endif
+#include <grub/i386/slaunch.h>
+#include <grub/i386/txt.h>
#include <grub/i386/relocator.h>
#define CONCAT(a,b) CONCAT_(a, b)
@@ -60,6 +62,9 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
grub_uint32_t load_offset = 0, load_size;
int i;
void *source = NULL;
+ struct grub_slaunch_params *slparams = grub_slaunch_params();
+ grub_size_t total_size;
+ grub_uint32_t mle_hdr_offset;
if (ehdr->e_ident[EI_MAG0] != ELFMAG0
|| ehdr->e_ident[EI_MAG1] != ELFMAG1
@@ -106,25 +111,87 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
(long) mld->align, mld->preference, load_size,
mld->avoid_efi_boot_services);
- if (load_size > mld->max_addr || mld->min_addr > mld->max_addr - load_size)
+ if (grub_slaunch_platform_type () == SLP_INTEL_TXT)
+ {
+#ifndef GRUB_USE_MULTIBOOT2
+ return grub_error (GRUB_ERR_BAD_OS, "Only multiboot2 supported for slaunch");
+#else
+ /*
+ * We allocate the the binary together with page tables to make one
+ * contiguous block for MLE. We have to align up to PMR (2MB).
+ */
+ total_size = ALIGN_UP(load_size, GRUB_TXT_PMR_ALIGN);
+
+ slparams->mle_size = total_size;
+
+ slparams->mle_ptab_size = grub_txt_get_mle_ptab_size (total_size);
+ slparams->mle_ptab_size = ALIGN_UP (slparams->mle_ptab_size, GRUB_TXT_PMR_ALIGN);
+
+ /* Do not go below GRUB_TXT_PMR_ALIGN. */
+ if (mld->align < GRUB_TXT_PMR_ALIGN)
+ mld->align = GRUB_TXT_PMR_ALIGN;
+#endif
+ }
+ else
+ {
+ total_size = load_size;
+ slparams->mle_ptab_size = 0;
+ }
+
+ if (total_size > mld->max_addr || mld->min_addr > mld->max_addr - total_size)
return grub_error (GRUB_ERR_BAD_OS, "invalid min/max address and/or load size");
err = grub_relocator_alloc_chunk_align_safe (GRUB_MULTIBOOT (relocator), &ch,
- mld->min_addr, mld->max_addr,
- load_size, mld->align ? mld->align : 1,
+ mld->min_addr, mld->max_addr - total_size,
+ total_size, mld->align ? mld->align : 1,
mld->preference, mld->avoid_efi_boot_services);
if (err)
- {
- grub_dprintf ("multiboot_loader", "Cannot allocate memory for OS image\n");
- return err;
- }
+ {
+ grub_dprintf ("multiboot_loader", "Cannot allocate memory for OS image\n");
+ return err;
+ }
mld->load_base_addr = get_physical_target_address (ch);
source = get_virtual_current_address (ch);
+ grub_memset (get_virtual_current_address (ch), 0, total_size);
+ grub_dprintf ("multiboot_loader", "load_base_addr=0x%lx, source=0x%lx\n",
+ (long) mld->load_base_addr, (long) source);
+
+ if (grub_slaunch_platform_type () == SLP_INTEL_TXT)
+ {
+#ifndef GRUB_USE_MULTIBOOT2
+ return grub_error (GRUB_ERR_BAD_OS, "Only multiboot2 supported for slaunch");
+#else
+ slparams->mle_start = mld->load_base_addr;
+ slparams->mle_mem = source;
+
+ err = grub_relocator_alloc_chunk_align_safe (GRUB_MULTIBOOT (relocator), &ch,
+ GRUB_MEMORY_MACHINE_UPPER_START,
+ mld->load_base_addr - slparams->mle_ptab_size,
+ slparams->mle_ptab_size, GRUB_TXT_PMR_ALIGN,
+ GRUB_RELOCATOR_PREFERENCE_NONE, 1);
+ if (err)
+ {
+ grub_dprintf ("multiboot_loader", "Cannot allocate memory for MLE page tables\n");
+ return err;
+ }
+
+ slparams->mle_ptab_mem = get_virtual_current_address (ch);
+ slparams->mle_ptab_target = (grub_uint64_t) get_physical_target_address (ch);
+ grub_dprintf ("multiboot_loader", "mle_ptab_mem = %p, mle_ptab_target = %lx, mle_ptab_size = %x\n",
+ slparams->mle_ptab_mem, (unsigned long) slparams->mle_ptab_target,
+ (unsigned) slparams->mle_ptab_size);
+#endif
+ }
}
else
- mld->load_base_addr = mld->link_base_addr;
+ {
+ mld->load_base_addr = mld->link_base_addr;
+ /* TODO: support non-relocatable */
+ if (grub_slaunch_platform_type () == SLP_INTEL_TXT)
+ return grub_error (GRUB_ERR_BAD_OS, "Non-relocatable ELF not supported with slaunch");
+ }
grub_dprintf ("multiboot_loader", "relocatable=%d, link_base_addr=0x%x, "
"load_base_addr=0x%x\n", mld->relocatable,
@@ -180,6 +247,27 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
}
}
+ if (grub_slaunch_platform_type () == SLP_INTEL_TXT)
+ {
+ slparams->mle_header_offset = 0xffffffff;
+
+ /* TODO: decide on universal way of conveying location of MLE header */
+ for (mle_hdr_offset = 0; mle_hdr_offset < 0x1000; mle_hdr_offset += 16)
+ {
+ if ( !grub_memcmp ((void *)((grub_addr_t) source + mle_hdr_offset), GRUB_TXT_MLE_UUID, 16) )
+ {
+ slparams->mle_header_offset = mle_hdr_offset;
+ break;
+ }
+ }
+
+ if (slparams->mle_header_offset == 0xffffffff)
+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "MLE header not found");
+
+ grub_dprintf ("slaunch", "slparams->mle_header_offset: 0x%08x\n",
+ slparams->mle_header_offset);
+ }
+
for (i = 0; i < ehdr->e_phnum; i++)
if (phdr(i)->p_vaddr <= ehdr->e_entry
&& phdr(i)->p_vaddr + phdr(i)->p_memsz > ehdr->e_entry)
diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
index 197afd1b1809..fd93bc0e4237 100644
--- a/grub-core/loader/multiboot_mbi2.c
+++ b/grub-core/loader/multiboot_mbi2.c
@@ -36,6 +36,10 @@
#include <grub/i18n.h>
#include <grub/net.h>
#include <grub/lib/cmdline.h>
+#include <grub/i386/memory.h>
+#include <grub/i386/slaunch.h>
+#include <grub/i386/txt.h>
+#include <grub/slr_table.h>
#if defined (GRUB_MACHINE_EFI)
#include <grub/efi/efi.h>
@@ -277,6 +281,9 @@ grub_multiboot2_load (grub_file_t file, const char *filename)
if (addr_tag)
{
+ if (grub_slaunch_platform_type () == SLP_INTEL_TXT)
+ return grub_error (GRUB_ERR_BAD_OS, "Slaunch not supported with multiboot addr tag");
+
grub_uint64_t load_addr = (addr_tag->load_addr + 1)
? addr_tag->load_addr : (addr_tag->header_addr
- ((char *) header - (char *) mld.buffer));
@@ -390,6 +397,34 @@ grub_multiboot2_load (grub_file_t file, const char *filename)
err = grub_multiboot2_set_console (GRUB_MULTIBOOT2_CONSOLE_EGA_TEXT,
accepted_consoles,
0, 0, 0, console_required);
+
+ if (grub_slaunch_platform_type () == SLP_INTEL_TXT)
+ {
+ grub_relocator_chunk_t ch;
+ struct grub_slaunch_params *slparams = grub_slaunch_params();
+
+ if (grub_relocator_alloc_chunk_align_safe (grub_multiboot2_relocator, &ch, 0x1000000,
+ UP_TO_TOP32 (GRUB_SLAUNCH_TPM_EVT_LOG_SIZE),
+ GRUB_SLAUNCH_TPM_EVT_LOG_SIZE, GRUB_PAGE_SIZE,
+ GRUB_RELOCATOR_PREFERENCE_HIGH, 1))
+ {
+ grub_free (mld.buffer);
+ return grub_error (GRUB_ERR_OUT_OF_MEMORY, "Could not allocate TPM event log area");
+ }
+
+ slparams->tpm_evt_log_base = get_physical_target_address (ch);
+ slparams->tpm_evt_log_size = GRUB_SLAUNCH_TPM_EVT_LOG_SIZE;
+
+ grub_txt_init_tpm_event_log(get_virtual_current_address (ch),
+ slparams->tpm_evt_log_size);
+
+ grub_dprintf ("multiboot_loader", "tpm_evt_log_base = %lx, tpm_evt_log_size = %x\n",
+ (unsigned long) slparams->tpm_evt_log_base,
+ (unsigned) slparams->tpm_evt_log_size);
+
+ grub_txt_setup_mle_ptab (slparams);
+ }
+
return err;
}
@@ -722,7 +757,12 @@ grub_multiboot2_make_mbi (grub_uint32_t *target, grub_uint32_t *size)
ptrorig = get_virtual_current_address (ch);
#if defined (__i386__) || defined (__x86_64__)
+ struct grub_slaunch_params *slparams = grub_slaunch_params();
+
*target = get_physical_target_address (ch);
+ /* Save MBI pointer in the TXT heap area */
+ if (grub_slaunch_platform_type () == SLP_INTEL_TXT)
+ slparams->boot_params_addr = *target;
#elif defined (__mips)
*target = get_physical_target_address (ch) | 0x80000000;
#else
@@ -1128,3 +1168,62 @@ grub_multiboot2_set_bootdev (void)
bootdev_set = 1;
}
+
+static void
+add_multiboot2_slrt_policy_entries (void)
+{
+ unsigned i;
+ struct module *cur;
+
+ for (i = 0, cur = modules; i < modcnt; i++, cur = cur->next)
+ {
+ grub_slaunch_add_slrt_policy_entry (17,
+ GRUB_SLR_ET_MULTIBOOT2_MODULE,
+ /*flags=*/0,
+ cur->start,
+ cur->size,
+ "Measured MB2 module");
+ }
+}
+
+grub_err_t
+grub_multiboot2_prepare_slaunch_txt (grub_uint32_t mbi_target,
+ grub_uint32_t mbi_size)
+{
+ grub_err_t err;
+ struct grub_slaunch_params *slparams = grub_slaunch_params ();
+
+ slparams->slr_table_base = GRUB_SLAUNCH_STORE_IN_OS2MLE;
+ slparams->slr_table_size = GRUB_PAGE_SIZE;
+
+ slparams->slr_table_mem = grub_zalloc (slparams->slr_table_size);
+ if (slparams->slr_table_mem == NULL)
+ return GRUB_ERR_OUT_OF_MEMORY;
+
+ err = grub_txt_boot_prepare (slparams);
+ if (err != GRUB_ERR_NONE)
+ {
+ grub_printf ("TXT boot preparation failed");
+ return err;
+ }
+
+ grub_slaunch_add_slrt_policy_entry (18,
+ GRUB_SLR_ET_MULTIBOOT2_INFO,
+ /*flags=*/0,
+ mbi_target,
+ mbi_size,
+ "Measured MB2 information");
+ grub_slaunch_add_slrt_policy_entries ();
+ grub_txt_add_slrt_policy_entries ();
+ add_multiboot2_slrt_policy_entries ();
+ grub_slaunch_finish_slr_table ();
+
+ grub_dprintf ("multiboot_loader", "slr_table_base = %lx, slr_table_size = %x\n",
+ (unsigned long) slparams->slr_table_base,
+ (unsigned) slparams->slr_table_size);
+ grub_memcpy ((void *)(grub_addr_t) slparams->slr_table_base,
+ slparams->slr_table_mem,
+ slparams->slr_table_size);
+
+ return GRUB_ERR_NONE;
+}
diff --git a/include/grub/multiboot2.h b/include/grub/multiboot2.h
index d1e3b3a8b4f6..0ca577e7395f 100644
--- a/include/grub/multiboot2.h
+++ b/include/grub/multiboot2.h
@@ -43,6 +43,8 @@ void grub_multiboot2_set_bootdev (void);
void
grub_multiboot2_add_elfsyms (grub_size_t num, grub_size_t entsize,
unsigned shndx, void *data);
+grub_err_t grub_multiboot2_prepare_slaunch_txt (grub_uint32_t mbi_target,
+ grub_uint32_t mbi_size);
grub_uint32_t grub_multiboot2_get_mmap_count (void);
grub_err_t grub_multiboot2_set_video_mode (void);
--
2.41.0