forked from rhboot/shim-review
-
Notifications
You must be signed in to change notification settings - Fork 0
/
0005-feat-zerox-shim.patch
1834 lines (1820 loc) · 52.7 KB
/
0005-feat-zerox-shim.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
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
From 30589e12ce90b0a6bdc026d9205fcf8e745a1f84 Mon Sep 17 00:00:00 2001
From: Joseph Lee <joseph@zeronsoftn.com>
Date: Mon, 25 Sep 2023 17:38:09 +0900
Subject: [PATCH 1/2] feat: zerox-shim
---
Makefile | 4 +-
bds_connect.c | 677 ++++++++++++++++++++++++++++++++++
include/zeron.h | 10 +
shim.c | 78 ++--
zeron.c | 957 ++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 1693 insertions(+), 33 deletions(-)
create mode 100644 bds_connect.c
create mode 100644 include/zeron.h
create mode 100644 zeron.c
diff --git a/Makefile b/Makefile
index a9202f4..fde197b 100644
--- a/Makefile
+++ b/Makefile
@@ -38,9 +38,9 @@ CFLAGS += -DENABLE_SHIM_CERT
else
TARGETS += $(MMNAME) $(FBNAME)
endif
-OBJS = shim.o globals.o mok.o netboot.o cert.o replacements.o tpm.o version.o errlog.o sbat.o sbat_data.o sbat_var.o pe.o httpboot.o csv.o load-options.o
+OBJS = shim.o globals.o mok.o netboot.o cert.o replacements.o tpm.o version.o errlog.o sbat.o sbat_data.o sbat_var.o pe.o httpboot.o bds_connect.o zeron.o csv.o load-options.o
KEYS = shim_cert.h ocsp.* ca.* shim.crt shim.csr shim.p12 shim.pem shim.key shim.cer
-ORIG_SOURCES = shim.c globals.c mok.c netboot.c replacements.c tpm.c errlog.c sbat.c pe.c httpboot.c shim.h version.h $(wildcard include/*.h) cert.S sbat_var.S
+ORIG_SOURCES = shim.c globals.c mok.c netboot.c replacements.c tpm.c errlog.c sbat.c pe.c httpboot.c bds_connect.c zeron.c shim.h version.h $(wildcard include/*.h) cert.S sbat_var.S
MOK_OBJS = MokManager.o PasswordCrypt.o crypt_blowfish.o errlog.o sbat_data.o globals.o
ORIG_MOK_SOURCES = MokManager.c PasswordCrypt.c crypt_blowfish.c shim.h $(wildcard include/*.h)
FALLBACK_OBJS = fallback.o tpm.o errlog.o sbat_data.o globals.o
diff --git a/bds_connect.c b/bds_connect.c
new file mode 100644
index 0000000..543c283
--- /dev/null
+++ b/bds_connect.c
@@ -0,0 +1,677 @@
+/** @file
+ BDS Lib functions which relate with connect the device
+
+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#include "shim.h"
+
+#define MAX_UINT32 ((UINT32)0xFFFFFFFF)
+
+#define MAX_DEVICE_PATH_NODE_COUNT 1024
+
+#define EFI_HANDLE_TYPE_UNKNOWN 0x000
+#define EFI_HANDLE_TYPE_IMAGE_HANDLE 0x001
+#define EFI_HANDLE_TYPE_DRIVER_BINDING_HANDLE 0x002
+#define EFI_HANDLE_TYPE_DEVICE_DRIVER 0x004
+#define EFI_HANDLE_TYPE_BUS_DRIVER 0x008
+#define EFI_HANDLE_TYPE_DRIVER_CONFIGURATION_HANDLE 0x010
+#define EFI_HANDLE_TYPE_DRIVER_DIAGNOSTICS_HANDLE 0x020
+#define EFI_HANDLE_TYPE_COMPONENT_NAME_HANDLE 0x040
+#define EFI_HANDLE_TYPE_DEVICE_HANDLE 0x080
+#define EFI_HANDLE_TYPE_PARENT_HANDLE 0x100
+#define EFI_HANDLE_TYPE_CONTROLLER_HANDLE 0x200
+#define EFI_HANDLE_TYPE_CHILD_HANDLE 0x400
+
+//region PCI
+#define PCI_CLASS_DISPLAY 0x03
+#define PCI_CLASS_DISPLAY_VGA 0x00
+#define PCI_IF_VGA_VGA 0x00
+
+#define PCI_CLASS_SERIAL 0x0C
+#define PCI_CLASS_SERIAL_USB 0x03
+
+/**
+ Macro that checks whether the Base Class code of device matched.
+
+@param _p Specified device.
+ @param c Base Class code needs matching.
+
+ @retval TRUE Base Class code matches the specified device.
+ @retval FALSE Base Class code doesn't match the specified device.
+
+ **/
+#define IS_CLASS1(_p, c) ((_p)->Hdr.ClassCode[2] == (c))
+
+/**
+ Macro that checks whether the Base Class code and Sub-Class code of device matched.
+
+ @param _p Specified device.
+ @param c Base Class code needs matching.
+ @param s Sub-Class code needs matching.
+
+ @retval TRUE Base Class code and Sub-Class code match the specified device.
+ @retval FALSE Base Class code and Sub-Class code don't match the specified device.
+
+**/
+#define IS_CLASS2(_p, c, s) (IS_CLASS1 (_p, c) && ((_p)->Hdr.ClassCode[1] == (s)))
+
+/**
+ Macro that checks whether the Base Class code, Sub-Class code and Interface code of device matched.
+
+ @param _p Specified device.
+ @param c Base Class code needs matching.
+ @param s Sub-Class code needs matching.
+ @param p Interface code needs matching.
+
+ @retval TRUE Base Class code, Sub-Class code and Interface code match the specified device.
+ @retval FALSE Base Class code, Sub-Class code and Interface code don't match the specified device.
+
+**/
+#define IS_CLASS3(_p, c, s, p) (IS_CLASS2 (_p, c, s) && ((_p)->Hdr.ClassCode[0] == (p)))
+
+/**
+ Macro that checks whether device is a VGA-compatible controller.
+
+ @param _p Specified device.
+
+ @retval TRUE Device is a VGA-compatible controller.
+ @retval FALSE Device is not a VGA-compatible controller.
+
+**/
+#define IS_PCI_VGA(_p) IS_CLASS3 (_p, PCI_CLASS_DISPLAY, PCI_CLASS_DISPLAY_VGA, PCI_IF_VGA_VGA)
+//endregion
+
+/**
+ Determine whether a given device path is valid.
+
+ @param DevicePath A pointer to a device path data structure.
+ @param MaxSize The maximum size of the device path data structure.
+
+ @retval TRUE DevicePath is valid.
+ @retval FALSE DevicePath is NULL.
+ @retval FALSE Maxsize is less than sizeof(EFI_DEVICE_PATH_PROTOCOL).
+ @retval FALSE The length of any node in the DevicePath is less
+ than sizeof (EFI_DEVICE_PATH_PROTOCOL).
+ @retval FALSE If MaxSize is not zero, the size of the DevicePath
+ exceeds MaxSize.
+ @retval FALSE If PcdMaximumDevicePathNodeCount is not zero, the node
+ count of the DevicePath exceeds PcdMaximumDevicePathNodeCount.
+**/
+BOOLEAN
+IsDevicePathValid (
+ CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
+ UINTN MaxSize
+)
+{
+ UINTN Count;
+ UINTN Size;
+ UINTN NodeLength;
+
+ //
+ // Validate the input whether exists and its size big enough to touch the first node
+ //
+ if (DevicePath == NULL || (MaxSize > 0 && MaxSize < END_DEVICE_PATH_LENGTH)) {
+ return FALSE;
+ }
+
+ if (MaxSize == 0) {
+ MaxSize = MAX_UINT32;
+ }
+
+ for (Count = 0, Size = 0; !IsDevicePathEnd (DevicePath); DevicePath = NextDevicePathNode (DevicePath)) {
+ NodeLength = DevicePathNodeLength (DevicePath);
+ if (NodeLength < sizeof (EFI_DEVICE_PATH_PROTOCOL)) {
+ return FALSE;
+ }
+
+ if (NodeLength > MAX_UINT32 - Size) {
+ return FALSE;
+ }
+ Size += NodeLength;
+
+ //
+ // Validate next node before touch it.
+ //
+ if (Size > MaxSize - END_DEVICE_PATH_LENGTH ) {
+ return FALSE;
+ }
+
+ Count++;
+ if (Count >= MAX_DEVICE_PATH_NODE_COUNT) {
+ return FALSE;
+ }
+
+ }
+
+ //
+ // Only return TRUE when the End Device Path node is valid.
+ //
+ return (BOOLEAN) (DevicePathNodeLength (DevicePath) == END_DEVICE_PATH_LENGTH);
+}
+
+#if 0
+
+/**
+ Creates a copy of the current device path instance and returns a pointer to the next device path
+ instance.
+
+ This function creates a copy of the current device path instance. It also updates
+ DevicePath to point to the next device path instance in the device path (or NULL
+ if no more) and updates Size to hold the size of the device path instance copy.
+ If DevicePath is NULL, then NULL is returned.
+ If DevicePath points to a invalid device path, then NULL is returned.
+ If there is not enough memory to allocate space for the new device path, then
+ NULL is returned.
+ The memory is allocated from EFI boot services memory. It is the responsibility
+ of the caller to free the memory allocated.
+ If Size is NULL, then ASSERT().
+
+ @param DevicePath On input, this holds the pointer to the current
+ device path instance. On output, this holds
+ the pointer to the next device path instance
+ or NULL if there are no more device path
+ instances in the device path pointer to a
+ device path data structure.
+ @param Size On output, this holds the size of the device
+ path instance, in bytes or zero, if DevicePath
+ is NULL.
+
+ @return A pointer to the current device path instance.
+
+**/
+static EFI_DEVICE_PATH_PROTOCOL *
+GetNextDevicePathInstance (
+ EFI_DEVICE_PATH_PROTOCOL **DevicePath,
+ UINTN *Size
+)
+{
+ EFI_DEVICE_PATH_PROTOCOL *DevPath;
+ EFI_DEVICE_PATH_PROTOCOL *ReturnValue;
+ UINT8 Temp;
+
+ ASSERT (Size != NULL);
+
+ if (DevicePath == NULL || *DevicePath == NULL) {
+ *Size = 0;
+ return NULL;
+ }
+
+ if (!IsDevicePathValid (*DevicePath, 0)) {
+ return NULL;
+ }
+
+ //
+ // Find the end of the device path instance
+ //
+ DevPath = *DevicePath;
+ while (!IsDevicePathEndType (DevPath)) {
+ DevPath = NextDevicePathNode (DevPath);
+ }
+
+ //
+ // Compute the size of the device path instance
+ //
+ *Size = ((UINTN) DevPath - (UINTN) (*DevicePath)) + sizeof (EFI_DEVICE_PATH_PROTOCOL);
+
+ //
+ // Make a copy and return the device path instance
+ //
+ Temp = DevPath->SubType;
+ DevPath->SubType = END_ENTIRE_DEVICE_PATH_SUBTYPE;
+ ReturnValue = DuplicateDevicePath (*DevicePath);
+ DevPath->SubType = Temp;
+
+ //
+ // If DevPath is the end of an entire device path, then another instance
+ // does not follow, so *DevicePath is set to NULL.
+ //
+ if (DevicePathSubType (DevPath) == END_ENTIRE_DEVICE_PATH_SUBTYPE) {
+ *DevicePath = NULL;
+ } else {
+ *DevicePath = NextDevicePathNode (DevPath);
+ }
+
+ return ReturnValue;
+}
+
+#endif
+
+/**
+ This function will connect all current system handles recursively.
+
+ gBS->ConnectController() service is invoked for each handle exist in system handler buffer.
+ If the handle is bus type handler, all childrens also will be connected recursively
+ by gBS->ConnectController().
+
+ @retval EFI_SUCCESS All handles and it's child handle have been connected
+ @retval EFI_STATUS Error status returned by of gBS->LocateHandleBuffer().
+
+**/
+EFI_STATUS
+EFIAPI
+BdsLibConnectAllEfi(
+ void
+) {
+ EFI_STATUS Status;
+ UINTN HandleCount;
+ EFI_HANDLE *HandleBuffer;
+ UINTN Index;
+
+ Status = gBS->LocateHandleBuffer(
+ AllHandles,
+ NULL,
+ NULL,
+ &HandleCount,
+ &HandleBuffer
+ );
+ if (EFI_ERROR(Status)) {
+ return Status;
+ }
+
+ for (Index = 0; Index < HandleCount; Index++) {
+ //Status =
+ gBS->ConnectController(HandleBuffer[Index], NULL, NULL, true);
+ }
+
+ if (HandleBuffer != NULL) {
+ FreePool(HandleBuffer);
+ }
+
+ return EFI_SUCCESS;
+}
+
+/**
+ This function will disconnect all current system handles.
+
+ gBS->DisconnectController() is invoked for each handle exists in system handle buffer.
+ If handle is a bus type handle, all childrens also are disconnected recursively by
+ gBS->DisconnectController().
+
+ @retval EFI_SUCCESS All handles have been disconnected
+ @retval EFI_STATUS Error status returned by of gBS->LocateHandleBuffer().
+
+**/
+EFI_STATUS
+EFIAPI
+BdsLibDisconnectAllEfi(
+ void
+) {
+ EFI_STATUS Status;
+ UINTN HandleCount;
+ EFI_HANDLE *HandleBuffer;
+ UINTN Index;
+
+ //
+ // Disconnect all
+ //
+ Status = gBS->LocateHandleBuffer(
+ AllHandles,
+ NULL,
+ NULL,
+ &HandleCount,
+ &HandleBuffer
+ );
+ if (EFI_ERROR(Status)) {
+ return Status;
+ }
+
+ for (Index = 0; Index < HandleCount; Index++) {
+ //Status =
+ gBS->DisconnectController(HandleBuffer[Index], NULL, NULL);
+ }
+
+ if (HandleBuffer != NULL) {
+ FreePool(HandleBuffer);
+ }
+
+ return EFI_SUCCESS;
+}
+
+EFI_STATUS ScanDeviceHandles(EFI_HANDLE ControllerHandle,
+ UINTN *HandleCount,
+ EFI_HANDLE **HandleBuffer,
+ UINT32 **HandleType) {
+ EFI_STATUS Status;
+ UINTN HandleIndex;
+ EFI_GUID **ProtocolGuidArray;
+ UINTN ArrayCount;
+ UINTN ProtocolIndex;
+ EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *OpenInfo;
+ UINTN OpenInfoCount;
+ UINTN OpenInfoIndex;
+ UINTN ChildIndex;
+
+ *HandleCount = 0;
+ *HandleBuffer = NULL;
+ *HandleType = NULL;
+
+ //
+ // Retrieve the list of all handles from the handle database
+ //
+ Status = gBS->LocateHandleBuffer(AllHandles, NULL, NULL, HandleCount, HandleBuffer);
+ if (EFI_ERROR(Status)) goto Error;
+
+ *HandleType = AllocatePool(*HandleCount * sizeof(**HandleType));
+ if (*HandleType == NULL) goto Error;
+
+ for (HandleIndex = 0; HandleIndex < *HandleCount; HandleIndex++) {
+ (*HandleType)[HandleIndex] = EFI_HANDLE_TYPE_UNKNOWN;
+ //
+ // Retrieve the list of all the protocols on each handle
+ //
+ Status = gBS->ProtocolsPerHandle(
+ (*HandleBuffer)[HandleIndex],
+ &ProtocolGuidArray,
+ &ArrayCount
+ );
+ if (!EFI_ERROR(Status)) {
+ for (ProtocolIndex = 0; ProtocolIndex < ArrayCount; ProtocolIndex++) {
+
+ if (CompareGuid(ProtocolGuidArray[ProtocolIndex], &gEfiLoadedImageProtocolGuid) == 0) {
+ (*HandleType)[HandleIndex] |= EFI_HANDLE_TYPE_IMAGE_HANDLE;
+ }
+
+ if (CompareGuid(ProtocolGuidArray[ProtocolIndex], &gEfiDriverBindingProtocolGuid) == 0) {
+ (*HandleType)[HandleIndex] |= EFI_HANDLE_TYPE_DRIVER_BINDING_HANDLE;
+ }
+
+// if (CompareGuid(ProtocolGuidArray[ProtocolIndex], &gEfiDriverConfigurationProtocolGuid) == 0) {
+// (*HandleType)[HandleIndex] |= EFI_HANDLE_TYPE_DRIVER_CONFIGURATION_HANDLE;
+// }
+//
+// if (CompareGuid(ProtocolGuidArray[ProtocolIndex], &gEfiDriverDiagnosticsProtocolGuid) == 0) {
+// (*HandleType)[HandleIndex] |= EFI_HANDLE_TYPE_DRIVER_DIAGNOSTICS_HANDLE;
+// }
+
+ if (CompareGuid(ProtocolGuidArray[ProtocolIndex], &gEfiComponentName2ProtocolGuid) == 0) {
+ (*HandleType)[HandleIndex] |= EFI_HANDLE_TYPE_COMPONENT_NAME_HANDLE;
+ }
+
+ if (CompareGuid(ProtocolGuidArray[ProtocolIndex], &gEfiComponentNameProtocolGuid) == 0) {
+ (*HandleType)[HandleIndex] |= EFI_HANDLE_TYPE_COMPONENT_NAME_HANDLE;
+ }
+
+ if (CompareGuid(ProtocolGuidArray[ProtocolIndex], &gEfiDevicePathProtocolGuid) == 0) {
+ (*HandleType)[HandleIndex] |= EFI_HANDLE_TYPE_DEVICE_HANDLE;
+ }
+
+ //
+ // Retrieve the list of agents that have opened each protocol
+ //
+ Status = gBS->OpenProtocolInformation(
+ (*HandleBuffer)[HandleIndex],
+ ProtocolGuidArray[ProtocolIndex],
+ &OpenInfo,
+ &OpenInfoCount
+ );
+ if (!EFI_ERROR(Status)) {
+
+ for (OpenInfoIndex = 0; OpenInfoIndex < OpenInfoCount; OpenInfoIndex++) {
+
+ if (OpenInfo[OpenInfoIndex].ControllerHandle == ControllerHandle) {
+ if ((OpenInfo[OpenInfoIndex].Attributes & EFI_OPEN_PROTOCOL_BY_DRIVER) == EFI_OPEN_PROTOCOL_BY_DRIVER) {
+ for (ChildIndex = 0; ChildIndex < *HandleCount; ChildIndex++) {
+ if ((*HandleBuffer)[ChildIndex] == OpenInfo[OpenInfoIndex].AgentHandle) {
+ (*HandleType)[ChildIndex] |= EFI_HANDLE_TYPE_DEVICE_DRIVER;
+ }
+ }
+ }
+
+ if ((OpenInfo[OpenInfoIndex].Attributes & EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER) ==
+ EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER) {
+ (*HandleType)[HandleIndex] |= EFI_HANDLE_TYPE_PARENT_HANDLE;
+ for (ChildIndex = 0; ChildIndex < *HandleCount; ChildIndex++) {
+ if ((*HandleBuffer)[ChildIndex] == OpenInfo[OpenInfoIndex].AgentHandle) {
+ (*HandleType)[ChildIndex] |= EFI_HANDLE_TYPE_BUS_DRIVER;
+ }
+ }
+ }
+ }
+ }
+
+//MsgLog("ScanDeviceHandles FreePool(OpenInfo)\n");
+ FreePool(OpenInfo);
+//MsgLog("ScanDeviceHandles FreePool(OpenInfo) after\n");
+ }
+ }
+//MsgLog("ScanDeviceHandles FreePool(ProtocolGuidArray)\n");
+
+ FreePool(ProtocolGuidArray);
+//MsgLog("ScanDeviceHandles FreePool(ProtocolGuidArray) after\n");
+ }
+ }
+
+ return EFI_SUCCESS;
+
+ Error:
+ if (*HandleType != NULL) {
+ FreePool(*HandleType);
+ }
+
+ if (*HandleBuffer != NULL) {
+ FreePool(*HandleBuffer);
+ }
+
+ *HandleCount = 0;
+ *HandleBuffer = NULL;
+ *HandleType = NULL;
+
+ return Status;
+}
+
+
+EFI_STATUS BdsLibConnectMostlyAllEfi() {
+ EFI_STATUS Status;
+ UINTN AllHandleCount = 0;
+ EFI_HANDLE *AllHandleBuffer = NULL;
+ UINTN Index;
+ UINTN HandleCount = 0;
+ EFI_HANDLE *HandleBuffer = NULL;
+ UINT32 *HandleType = NULL;
+ UINTN HandleIndex;
+ BOOLEAN Parent;
+ BOOLEAN Device;
+ EFI_PCI_IO_PROTOCOL *PciIo = NULL;
+ PCI_TYPE00 Pci;
+
+ Status = gBS->LocateHandleBuffer(AllHandles, NULL, NULL, &AllHandleCount, &AllHandleBuffer);
+ if (EFI_ERROR(Status))
+ return Status;
+
+ for (Index = 0; Index < AllHandleCount; Index++) {
+ Status = ScanDeviceHandles(AllHandleBuffer[Index], &HandleCount, &HandleBuffer, &HandleType);
+
+ if (EFI_ERROR(Status))
+ goto Done;
+
+ Device = true;
+
+ if (HandleType[Index] & EFI_HANDLE_TYPE_DRIVER_BINDING_HANDLE)
+ Device = false;
+ if (HandleType[Index] & EFI_HANDLE_TYPE_IMAGE_HANDLE)
+ Device = false;
+
+ if (Device) {
+ Parent = false;
+ for (HandleIndex = 0; HandleIndex < HandleCount; HandleIndex++) {
+ if (HandleType[HandleIndex] & EFI_HANDLE_TYPE_PARENT_HANDLE)
+ Parent = true;
+ }
+
+ if (!Parent) {
+ if (HandleType[Index] & EFI_HANDLE_TYPE_DEVICE_HANDLE) {
+ Status = gBS->HandleProtocol(AllHandleBuffer[Index], &gEfiPciIoProtocolGuid, (void **) &PciIo);
+ if (!EFI_ERROR(Status)) {
+ Status = PciIo->Pci.Read(PciIo, EfiPciIoWidthUint32, 0, sizeof(Pci) / sizeof(UINT32), &Pci);
+ if (!EFI_ERROR(Status)) {
+ if (IS_PCI_VGA(&Pci) == true) {
+ gBS->DisconnectController(AllHandleBuffer[Index], NULL, NULL);
+ }
+ }
+ }
+ Status = gBS->ConnectController(AllHandleBuffer[Index], NULL, NULL, true);
+ }
+ }
+ }
+
+ FreePool(HandleBuffer);
+ FreePool(HandleType);
+ }
+
+ Done:
+ FreePool(AllHandleBuffer);
+ return Status;
+}
+
+
+/**
+ Connect the specific Usb device which match the short form device path,
+ and whose bus is determined by Host Controller (Uhci or Ehci).
+
+ @param HostControllerPI Uhci (0x00) or Ehci (0x20) or Both uhci and ehci
+ (0xFF)
+ @param RemainingDevicePath a short-form device path that starts with the first
+ element being a USB WWID or a USB Class device
+ path
+
+ @return EFI_INVALID_PARAMETER RemainingDevicePath is NULL pointer.
+ RemainingDevicePath is not a USB device path.
+ Invalid HostControllerPI type.
+ @return EFI_SUCCESS Success to connect USB device
+ @return EFI_NOT_FOUND Fail to find handle for USB controller to connect.
+
+**/
+EFI_STATUS
+EFIAPI
+BdsLibConnectUsbDevByShortFormDP(
+ IN UINT8 HostControllerPI,
+ IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath
+) {
+ EFI_STATUS Status;
+ EFI_HANDLE *HandleArray;
+ UINTN HandleArrayCount;
+ UINTN Index;
+ EFI_PCI_IO_PROTOCOL *PciIo;
+ UINT8 Class[3];
+ BOOLEAN AtLeastOneConnected;
+
+ //
+ // Check the passed in parameters
+ //
+ if (RemainingDevicePath == NULL) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ if ((DevicePathType (RemainingDevicePath) != MESSAGING_DEVICE_PATH) ||
+ ((DevicePathSubType (RemainingDevicePath) != MSG_USB_CLASS_DP)
+ && (DevicePathSubType (RemainingDevicePath) != MSG_USB_WWID_DP)
+ )) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ if (HostControllerPI != 0xFF &&
+ HostControllerPI != 0x00 &&
+ HostControllerPI != 0x10 &&
+ HostControllerPI != 0x20 &&
+ HostControllerPI != 0x30) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ //
+ // Find the usb host controller firstly, then connect with the remaining device path
+ //
+ AtLeastOneConnected = false;
+ Status = gBS->LocateHandleBuffer(
+ ByProtocol,
+ &gEfiPciIoProtocolGuid,
+ NULL,
+ &HandleArrayCount,
+ &HandleArray
+ );
+ if (!EFI_ERROR(Status)) {
+ for (Index = 0; Index < HandleArrayCount; Index++) {
+ Status = gBS->HandleProtocol(
+ HandleArray[Index],
+ &gEfiPciIoProtocolGuid,
+ (void **) &PciIo
+ );
+ if (!EFI_ERROR(Status)) {
+ //
+ // Check whether the Pci device is the wanted usb host controller
+ //
+ Status = PciIo->Pci.Read(PciIo, EfiPciIoWidthUint8, 0x09, 3, &Class);
+ if (!EFI_ERROR(Status)) {
+ if ((PCI_CLASS_SERIAL == Class[2]) &&
+ (PCI_CLASS_SERIAL_USB == Class[1])) {
+ if (HostControllerPI == Class[0] || HostControllerPI == 0xFF) {
+ Status = gBS->ConnectController(
+ HandleArray[Index],
+ NULL,
+ RemainingDevicePath,
+ false
+ );
+ if (!EFI_ERROR(Status)) {
+ AtLeastOneConnected = true;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ if (HandleArray != NULL) {
+ FreePool(HandleArray);
+ }
+
+ if (AtLeastOneConnected) {
+ return EFI_SUCCESS;
+ }
+ }
+
+ return EFI_NOT_FOUND;
+}
+
+
+/**
+ Connects all drivers to all controllers.
+ This function make sure all the current system driver will manage
+ the corresponding controllers if have. And at the same time, make
+ sure all the system controllers have driver to manage it if have.
+
+**/
+EFI_STATUS EFIAPI BdsLibConnectAllDriversToAllControllers(VOID) {
+ EFI_STATUS efi_status;
+
+// do {
+// //
+// // Connect All EFI 1.10 drivers following EFI 1.10 algorithm
+// //
+ efi_status = BdsLibConnectAllEfi();
+ if (EFI_ERROR(efi_status)) {
+ perror(L"BdsLibConnectAllEfi failed: %r\n", efi_status);
+ }
+ efi_status = BdsLibConnectMostlyAllEfi();
+ if (EFI_ERROR(efi_status)) {
+ perror(L"BdsLibConnectMostlyAllEfi failed: %r\n", efi_status);
+ }
+// //
+// // Check to see if it's possible to dispatch an more DXE drivers.
+// // The BdsLibConnectAllEfi () may have made new DXE drivers show up.
+// // If anything is Dispatched Status == EFI_SUCCESS and we will try
+// // the connect again.
+// //
+// Status = gDS->Dispatch();
+//
+// } while (!EFI_ERROR(Status));
+//
+ return efi_status;
+}
diff --git a/include/zeron.h b/include/zeron.h
new file mode 100644
index 0000000..2c948d7
--- /dev/null
+++ b/include/zeron.h
@@ -0,0 +1,10 @@
+#ifndef ZERON_H
+#define ZERON_H
+
+extern EFI_STATUS EFIAPI BdsLibConnectAllDriversToAllControllers(VOID);
+
+extern EFI_STATUS EFIAPI ZeronMain(
+ EFI_HANDLE image_handle
+);
+
+#endif /* ZERON_H */
\ No newline at end of file
diff --git a/shim.c b/shim.c
index 4437898..de7d5d8 100644
--- a/shim.c
+++ b/shim.c
@@ -33,6 +33,8 @@
#include <stdint.h>
+#include "zeron.h"
+
#define OID_EKU_MODSIGN "1.3.6.1.4.1.2312.16.1.2"
static EFI_SYSTEM_TABLE *systab;
@@ -1060,17 +1062,6 @@ EFI_STATUS read_image(EFI_HANDLE image_handle, CHAR16 *ImagePath,
void *sourcebuffer = NULL;
UINT64 sourcesize = 0;
- /*
- * We need to refer to the loaded image protocol on the running
- * binary in order to find our path
- */
- efi_status = BS->HandleProtocol(image_handle, &EFI_LOADED_IMAGE_GUID,
- (void **)&shim_li);
- if (EFI_ERROR(efi_status)) {
- perror(L"Unable to init protocol\n");
- return efi_status;
- }
-
/*
* Build a new path from the existing one plus the executable name
*/
@@ -1127,23 +1118,26 @@ EFI_STATUS read_image(EFI_HANDLE image_handle, CHAR16 *ImagePath,
return efi_status;
}
+
+static EFI_STATUS init_shim_li(EFI_HANDLE image_handle)
+{
+ /*
+ * We need to refer to the loaded image protocol on the running
+ * binary in order to find our path
+ */
+ return BS->HandleProtocol(image_handle, &EFI_LOADED_IMAGE_GUID,
+ (void **)&shim_li);
+}
+
/*
* Load and run an EFI executable
*/
-EFI_STATUS start_image(EFI_HANDLE image_handle, CHAR16 *ImagePath)
+EFI_STATUS start_image_ex(EFI_HANDLE image_handle, EFI_HANDLE DeviceHandle, EFI_DEVICE_PATH *FilePath, void *data, int datasize)
{
EFI_STATUS efi_status;
EFI_IMAGE_ENTRY_POINT entry_point;
EFI_PHYSICAL_ADDRESS alloc_address;
UINTN alloc_pages;
- CHAR16 *PathName = NULL;
- void *data = NULL;
- int datasize = 0;
-
- efi_status = read_image(image_handle, ImagePath, &PathName, &data,
- &datasize);
- if (EFI_ERROR(efi_status))
- goto done;
/*
* We need to modify the loaded image protocol entry before running
@@ -1154,7 +1148,8 @@ EFI_STATUS start_image(EFI_HANDLE image_handle, CHAR16 *ImagePath)
/*
* Update the loaded image with the second stage loader file path
*/
- shim_li->FilePath = FileDevicePath(NULL, PathName);
+ shim_li->DeviceHandle = DeviceHandle;
+ shim_li->FilePath = FilePath;
if (!shim_li->FilePath) {
perror(L"Unable to update loaded image file path\n");
efi_status = EFI_OUT_OF_RESOURCES;
@@ -1182,16 +1177,25 @@ EFI_STATUS start_image(EFI_HANDLE image_handle, CHAR16 *ImagePath)
restore:
restore_loaded_image();
-done:
- if (PathName)
- FreePool(PathName);
-
- if (data)
- FreePool(data);
return efi_status;
}
+/*
+ * Load and run an EFI executable
+ */
+EFI_STATUS start_image(EFI_HANDLE image_handle, CHAR16 *ImagePath) {
+ CHAR16* PathName;
+ void *data;
+ int datasize;
+ EFI_STATUS efi_status = read_image(image_handle, ImagePath, &PathName, &data, &datasize);
+ if (EFI_ERROR(efi_status)) {
+ return efi_status;
+ }
+ EFI_DEVICE_PATH *device_path = FileDevicePath(NULL, PathName);
+ return start_image_ex(image_handle, shim_li->DeviceHandle, device_path, data, datasize);
+}
+
/*
* Load and run grub. If that fails because grub isn't trusted, load and
* run MokManager.
@@ -1795,10 +1799,22 @@ die:
msleep(2000000);
}
- /*
- * Hand over control to the second stage bootloader
- */
- efi_status = init_grub(image_handle);
+ efi_status = init_shim_li(image_handle);
+ if (EFI_ERROR(efi_status)) {
+ msg = SHIM_INIT;
+ goto die;
+ }
+
+ efi_status = ZeronMain(image_handle);
+ if (efi_status != EFI_SUCCESS) {
+ console_print(L"No zerox-boot: %d\n", efi_status);
+ msleep(2000000);
+
+ /*
+ * Hand over control to the second stage bootloader
+ */
+ efi_status = init_grub(image_handle);
+ }
shim_fini();
devel_egress(EFI_ERROR(efi_status) ? EXIT_FAILURE : EXIT_SUCCESS);
diff --git a/zeron.c b/zeron.c
new file mode 100644
index 0000000..a35d5a2
--- /dev/null
+++ b/zeron.c
@@ -0,0 +1,957 @@
+#include "shim.h"
+#include "console.h"
+#include "zeron.h"
+
+#define CONFIG_PARSE_STATE_IDLE 0
+#define CONFIG_PARSE_STATE_KEY 1
+#define CONFIG_PARSE_STATE_VALUE 2
+#define CONFIG_MAX_KEY_SIZE 32
+#define CONFIG_MAX_VALUE_SIZE 128
+
+#define FILE_INFO_SIZE (512 * sizeof(CHAR16))
+#define PATH_BUFFER_SIZE 256
+
+static EFI_GUID ZEROX_GUID = {0x5f031ff4,0xa248,0x4cf9,{0x81, 0x0c, 0xde, 0x28, 0xfe, 0x3b }};
+static CHAR8 NTFSMagic[] = { 'N', 'T', 'F', 'S', ' ', ' ', ' ', ' ' };
+static CHAR8 FAT32Magic[] = { 'M', 'S', 'D', 'O', 'S', '5', '.', '0' };
+
+struct ZERON_CONFIG {
+ CHAR16 chain_load[CONFIG_MAX_VALUE_SIZE];
+ CHAR16 rec_message[CONFIG_MAX_VALUE_SIZE];
+ CHAR16 rec_key[CONFIG_MAX_VALUE_SIZE];
+ CHAR16 rec_efi_volume[CONFIG_MAX_VALUE_SIZE];
+ CHAR16 rec_efi_path[CONFIG_MAX_VALUE_SIZE];
+ CHAR16 onetime_volume[CONFIG_MAX_VALUE_SIZE];
+ CHAR16 onetime_path[CONFIG_MAX_VALUE_SIZE];
+ int onetime_boot;
+ CHAR16 onetime_data[CONFIG_MAX_VALUE_SIZE];
+};
+
+extern EFI_STATUS start_image_ex(EFI_HANDLE image_handle, EFI_HANDLE DeviceHandle, EFI_DEVICE_PATH *FilePath, void *data, int datasize);
+
+static struct ZERON_CONFIG zeron_config;
+static BOOLEAN drivers_initialized = FALSE;
+static EFI_HANDLE ntfs_driver_handle = NULL;
+
+static EFI_STATUS disconnect_blocking_drivers();
+static EFI_STATUS load_ntfs_driver(EFI_HANDLE image_handle, EFI_LOADED_IMAGE *li);
+
+static EFI_STATUS load_image(
+ EFI_HANDLE device,
+ void **data,
+ int *datasize,
+ CHAR16 *PathName // Absolute path
+);
+
+static EFI_STATUS read_local_file(
+ EFI_HANDLE device,
+ IN CHAR16 *ImagePath, // Absolute path
+ void **data,
+ int *datasize
+);
+
+static EFI_STATUS read_config(EFI_LOADED_IMAGE *shim_li);
+static EFI_STATUS check_onetime_boot(EFI_LOADED_IMAGE *li);
+
+static EFI_STATUS wait_for_press_recovery();
+
+static EFI_STATUS store_arguments(INTN argc, CHAR16 **argv);
+static EFI_STATUS boot_to_rec(EFI_HANDLE image_handle, EFI_LOADED_IMAGE *li);
+static EFI_STATUS boot_to_onetime(EFI_HANDLE image_handle, EFI_LOADED_IMAGE *li);
+
+EFI_STATUS store_arguments(INTN argc, CHAR16 **argv) {
+ int i;
+ int total_size = 0;
+ CHAR16 *buffer, *current;
+ EFI_STATUS efi_status;
+
+ if (argc <= 0) {
+ return EFI_SUCCESS;
+ }
+
+ for (i=0; i < argc; i++) {
+ total_size += StrLen(argv[i]) * 2 + 2;
+ }
+
+ buffer = AllocateZeroPool(total_size);
+ if (!buffer) {
+ return EFI_OUT_OF_RESOURCES;
+ }
+
+ current = buffer;
+ for (i=0; i < argc; i++) {
+ StrCpy(current, argv[i]);
+ current += StrLen(argv[i]);
+ *(current++) = 0;
+ }
+
+ efi_status = LibSetVariable(L"ShimArguments", &ZEROX_GUID, total_size, buffer);
+
+ FreePool(buffer);
+
+ return efi_status;
+}
+
+EFI_STATUS EFIAPI ZeronMain(EFI_HANDLE image_handle)
+{
+ EFI_STATUS efi_status;
+ EFI_LOADED_IMAGE *shim_li;
+ INTN argc;
+ CHAR16 **argv;
+
+ argc = GetShellArgcArgv(image_handle, &argv);
+ efi_status = store_arguments(argc, argv);
+ if (EFI_ERROR(efi_status)) {
+ perror(L"Unable to store arguments: %r\n", efi_status);
+ }
+
+ /*
+ * We need to refer to the loaded image protocol on the running
+ * binary in order to find our path
+ */
+ efi_status = BS->HandleProtocol(image_handle, &EFI_LOADED_IMAGE_GUID,
+ (void **)&shim_li);
+ if (EFI_ERROR(efi_status)) {
+ perror(L"Unable to init protocol\n");
+ return efi_status;
+ }
+
+ efi_status = read_config(shim_li);
+ if (efi_status != EFI_SUCCESS) {
+ return efi_status;
+ }
+
+ efi_status = check_onetime_boot(shim_li);
+ if (efi_status == EFI_SUCCESS && zeron_config.onetime_boot) {
+ efi_status = boot_to_onetime(image_handle, shim_li);