summaryrefslogtreecommitdiff
path: root/fallback.c
diff options
context:
space:
mode:
Diffstat (limited to 'fallback.c')
-rw-r--r--fallback.c512
1 files changed, 268 insertions, 244 deletions
diff --git a/fallback.c b/fallback.c
index 46894aff..c3f5583c 100644
--- a/fallback.c
+++ b/fallback.c
@@ -10,18 +10,13 @@
#include <efi.h>
#include <efilib.h>
-#include "ucs2.h"
-#include "variables.h"
-#include "tpm.h"
+#include "shim.h"
EFI_LOADED_IMAGE *this_image = NULL;
-EFI_GUID SHIM_LOCK_GUID = { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} };
-
int
get_fallback_verbose(void)
{
- EFI_GUID guid = SHIM_LOCK_GUID;
UINT8 *data = NULL;
UINTN dataSize = 0;
EFI_STATUS efi_status;
@@ -32,20 +27,22 @@ get_fallback_verbose(void)
return state;
efi_status = get_variable(L"FALLBACK_VERBOSE",
- &data, &dataSize, guid);
+ &data, &dataSize, SHIM_LOCK_GUID);
if (EFI_ERROR(efi_status)) {
state = 0;
return state;
}
+ state = 0;
for (i = 0; i < dataSize; i++) {
if (data[i]) {
state = 1;
- return state;
+ break;
}
}
- state = 0;
+ if (data)
+ FreePool(data);
return state;
}
@@ -53,7 +50,7 @@ get_fallback_verbose(void)
({ \
UINTN ret_ = 0; \
if (get_fallback_verbose()) \
- ret_ = Print((fmt), ##__VA_ARGS__); \
+ ret_ = console_print((fmt), ##__VA_ARGS__); \
ret_; \
})
@@ -61,8 +58,8 @@ get_fallback_verbose(void)
({ UINTN line_ = __LINE__; \
UINTN ret_ = 0; \
if (get_fallback_verbose()) { \
- Print(L"%a:%d: ", __func__, line_); \
- ret_ = Print((fmt), ##__VA_ARGS__); \
+ console_print(L"%a:%d: ", __func__, line_); \
+ ret_ = console_print((fmt), ##__VA_ARGS__); \
} \
ret_; \
})
@@ -100,31 +97,32 @@ FindSubDevicePath(EFI_DEVICE_PATH *In, UINT8 Type, UINT8 SubType,
static EFI_STATUS
get_file_size(EFI_FILE_HANDLE fh, UINTN *retsize)
{
- EFI_STATUS rc;
+ EFI_STATUS efi_status;
void *buffer = NULL;
UINTN bs = 0;
- EFI_GUID finfo = EFI_FILE_INFO_ID;
/* The API here is "Call it once with bs=0, it fills in bs,
* then allocate a buffer and ask again to get it filled. */
- rc = uefi_call_wrapper(fh->GetInfo, 4, fh, &finfo, &bs, NULL);
- if (rc == EFI_BUFFER_TOO_SMALL) {
- buffer = AllocateZeroPool(bs);
- if (!buffer) {
- Print(L"Could not allocate memory\n");
- return EFI_OUT_OF_RESOURCES;
- }
- rc = uefi_call_wrapper(fh->GetInfo, 4, fh, &finfo,
- &bs, buffer);
+ efi_status = fh->GetInfo(fh, &EFI_FILE_INFO_GUID, &bs, NULL);
+ if (EFI_ERROR(efi_status) && efi_status != EFI_BUFFER_TOO_SMALL)
+ return efi_status;
+ if (bs == 0)
+ return EFI_SUCCESS;
+
+ buffer = AllocateZeroPool(bs);
+ if (!buffer) {
+ console_print(L"Could not allocate memory\n");
+ return EFI_OUT_OF_RESOURCES;
}
+ efi_status = fh->GetInfo(fh, &EFI_FILE_INFO_GUID, &bs, buffer);
/* This checks *either* the error from the first GetInfo, if it isn't
- * the EFI_BUFFER_TOO_SMALL we're expecting, or the second GetInfo call
- * in *any* case. */
- if (EFI_ERROR(rc)) {
- Print(L"Could not get file info: %d\n", rc);
+ * the EFI_BUFFER_TOO_SMALL we're expecting, or the second GetInfo
+ * call in *any* case. */
+ if (EFI_ERROR(efi_status)) {
+ console_print(L"Could not get file info: %r\n", efi_status);
if (buffer)
FreePool(buffer);
- return rc;
+ return efi_status;
}
EFI_FILE_INFO *fi = buffer;
*retsize = fi->FileSize;
@@ -136,38 +134,46 @@ EFI_STATUS
read_file(EFI_FILE_HANDLE fh, CHAR16 *fullpath, CHAR16 **buffer, UINT64 *bs)
{
EFI_FILE_HANDLE fh2;
- EFI_STATUS rc = uefi_call_wrapper(fh->Open, 5, fh, &fh2, fullpath,
- EFI_FILE_READ_ONLY, 0);
- if (EFI_ERROR(rc)) {
- Print(L"Couldn't open \"%s\": %d\n", fullpath, rc);
- return rc;
+ EFI_STATUS efi_status;
+
+ efi_status = fh->Open(fh, &fh2, fullpath, EFI_FILE_READ_ONLY, 0);
+ if (EFI_ERROR(efi_status)) {
+ console_print(L"Couldn't open \"%s\": %r\n", fullpath, efi_status);
+ return efi_status;
}
UINTN len = 0;
CHAR16 *b = NULL;
- rc = get_file_size(fh2, &len);
- if (EFI_ERROR(rc)) {
- uefi_call_wrapper(fh2->Close, 1, fh2);
- return rc;
+ efi_status = get_file_size(fh2, &len);
+ if (EFI_ERROR(efi_status)) {
+ console_print(L"Could not get file size for \"%s\": %r\n",
+ fullpath, efi_status);
+ fh2->Close(fh2);
+ return efi_status;
+ }
+
+ if (len > 1024 * PAGE_SIZE) {
+ fh2->Close(fh2);
+ return EFI_BAD_BUFFER_SIZE;
}
b = AllocateZeroPool(len + 2);
if (!buffer) {
- Print(L"Could not allocate memory\n");
- uefi_call_wrapper(fh2->Close, 1, fh2);
+ console_print(L"Could not allocate memory\n");
+ fh2->Close(fh2);
return EFI_OUT_OF_RESOURCES;
}
- rc = uefi_call_wrapper(fh->Read, 3, fh, &len, b);
- if (EFI_ERROR(rc)) {
+ efi_status = fh->Read(fh, &len, b);
+ if (EFI_ERROR(efi_status)) {
FreePool(buffer);
- uefi_call_wrapper(fh2->Close, 1, fh2);
- Print(L"Could not read file: %d\n", rc);
- return rc;
+ fh2->Close(fh2);
+ console_print(L"Could not read file: %r\n", efi_status);
+ return efi_status;
}
*buffer = b;
*bs = len;
- uefi_call_wrapper(fh2->Close, 1, fh2);
+ fh2->Close(fh2);
return EFI_SUCCESS;
}
@@ -182,7 +188,7 @@ make_full_path(CHAR16 *dirname, CHAR16 *filename, CHAR16 **out, UINT64 *outlen)
CHAR16 *fullpath = AllocateZeroPool(len*sizeof(CHAR16));
if (!fullpath) {
- Print(L"Could not allocate memory\n");
+ console_print(L"Could not allocate memory\n");
return EFI_OUT_OF_RESOURCES;
}
@@ -210,8 +216,7 @@ add_boot_option(EFI_DEVICE_PATH *hddp, EFI_DEVICE_PATH *fulldp,
static int i = 0;
CHAR16 varname[] = L"Boot0000";
CHAR16 hexmap[] = L"0123456789ABCDEF";
- EFI_GUID global = EFI_GLOBAL_VARIABLE;
- EFI_STATUS rc;
+ EFI_STATUS efi_status;
for(; i <= 0xffff; i++) {
varname[4] = hexmap[(i & 0xf000) >> 12];
@@ -219,7 +224,7 @@ add_boot_option(EFI_DEVICE_PATH *hddp, EFI_DEVICE_PATH *fulldp,
varname[6] = hexmap[(i & 0x00f0) >> 4];
varname[7] = hexmap[(i & 0x000f) >> 0];
- void *var = LibGetVariable(varname, &global);
+ void *var = LibGetVariable(varname, &GV_GUID);
if (!var) {
int size = sizeof(UINT32) + sizeof (UINT16) +
StrLen(label)*2 + 2 + DevicePathSize(hddp) +
@@ -237,9 +242,9 @@ add_boot_option(EFI_DEVICE_PATH *hddp, EFI_DEVICE_PATH *fulldp,
cursor += DevicePathSize(hddp);
StrCpy((CHAR16 *)cursor, arguments);
- Print(L"Creating boot entry \"%s\" with label \"%s\" "
- L"for file \"%s\"\n",
- varname, label, filename);
+ console_print(L"Creating boot entry \"%s\" with label \"%s\" "
+ L"for file \"%s\"\n",
+ varname, label, filename);
if (!first_new_option) {
first_new_option = DuplicateDevicePath(fulldp);
@@ -247,17 +252,18 @@ add_boot_option(EFI_DEVICE_PATH *hddp, EFI_DEVICE_PATH *fulldp,
first_new_option_size = StrLen(arguments) * sizeof (CHAR16);
}
- rc = uefi_call_wrapper(RT->SetVariable, 5, varname,
- &global, EFI_VARIABLE_NON_VOLATILE |
- EFI_VARIABLE_BOOTSERVICE_ACCESS |
- EFI_VARIABLE_RUNTIME_ACCESS,
- size, data);
+ efi_status = gRT->SetVariable(varname, &GV_GUID,
+ EFI_VARIABLE_NON_VOLATILE |
+ EFI_VARIABLE_BOOTSERVICE_ACCESS |
+ EFI_VARIABLE_RUNTIME_ACCESS,
+ size, data);
FreePool(data);
- if (EFI_ERROR(rc)) {
- Print(L"Could not create variable: %d\n", rc);
- return rc;
+ if (EFI_ERROR(efi_status)) {
+ console_print(L"Could not create variable: %r\n",
+ efi_status);
+ return efi_status;
}
CHAR16 *newbootorder = AllocateZeroPool(sizeof (CHAR16)
@@ -275,10 +281,11 @@ add_boot_option(EFI_DEVICE_PATH *hddp, EFI_DEVICE_PATH *fulldp,
bootorder = newbootorder;
nbootorder += 1;
#ifdef DEBUG_FALLBACK
- Print(L"nbootorder: %d\nBootOrder: ", nbootorder);
+ console_print(L"nbootorder: %d\nBootOrder: ",
+ nbootorder);
for (j = 0 ; j < nbootorder ; j++)
- Print(L"%04x ", bootorder[j]);
- Print(L"\n");
+ console_print(L"%04x ", bootorder[j]);
+ console_print(L"\n");
#endif
return EFI_SUCCESS;
@@ -412,8 +419,7 @@ find_boot_option(EFI_DEVICE_PATH *dp, EFI_DEVICE_PATH *fulldp,
int i = 0;
CHAR16 varname[] = L"Boot0000";
CHAR16 hexmap[] = L"0123456789ABCDEF";
- EFI_GUID global = EFI_GLOBAL_VARIABLE;
- EFI_STATUS rc;
+ EFI_STATUS efi_status;
UINTN max_candidate_size = calc_masked_boot_option_size(size);
CHAR8 *candidate = AllocateZeroPool(max_candidate_size);
@@ -429,9 +435,9 @@ find_boot_option(EFI_DEVICE_PATH *dp, EFI_DEVICE_PATH *fulldp,
varname[7] = hexmap[(bootorder[i] & 0x000f) >> 0];
UINTN candidate_size = max_candidate_size;
- rc = uefi_call_wrapper(RT->GetVariable, 5, varname, &global,
- NULL, &candidate_size, candidate);
- if (EFI_ERROR(rc))
+ efi_status = gRT->GetVariable(varname, &GV_GUID, NULL,
+ &candidate_size, candidate);
+ if (EFI_ERROR(efi_status))
continue;
if (candidate_size != size) {
@@ -466,9 +472,8 @@ set_boot_order(void)
{
CHAR16 *oldbootorder;
UINTN size;
- EFI_GUID global = EFI_GLOBAL_VARIABLE;
- oldbootorder = LibGetVariableAndSize(L"BootOrder", &global, &size);
+ oldbootorder = LibGetVariableAndSize(L"BootOrder", &GV_GUID, &size);
if (oldbootorder) {
nbootorder = size / sizeof (CHAR16);
bootorder = oldbootorder;
@@ -482,9 +487,8 @@ update_boot_order(void)
{
UINTN size;
UINTN len = 0;
- EFI_GUID global = EFI_GLOBAL_VARIABLE;
CHAR16 *newbootorder = NULL;
- EFI_STATUS rc;
+ EFI_STATUS efi_status;
size = nbootorder * sizeof(CHAR16);
newbootorder = AllocateZeroPool(size);
@@ -496,19 +500,18 @@ update_boot_order(void)
UINTN j;
for (j = 0 ; j < size / sizeof (CHAR16); j++)
VerbosePrintUnprefixed(L"%04x ", newbootorder[j]);
- Print(L"\n");
- rc = uefi_call_wrapper(RT->GetVariable, 5, L"BootOrder", &global,
- NULL, &len, NULL);
- if (rc == EFI_BUFFER_TOO_SMALL)
- LibDeleteVariable(L"BootOrder", &global);
-
- rc = uefi_call_wrapper(RT->SetVariable, 5, L"BootOrder", &global,
- EFI_VARIABLE_NON_VOLATILE |
- EFI_VARIABLE_BOOTSERVICE_ACCESS |
- EFI_VARIABLE_RUNTIME_ACCESS,
- size, newbootorder);
+ console_print(L"\n");
+ efi_status = gRT->GetVariable(L"BootOrder", &GV_GUID, NULL, &len, NULL);
+ if (efi_status == EFI_BUFFER_TOO_SMALL)
+ LibDeleteVariable(L"BootOrder", &GV_GUID);
+
+ efi_status = gRT->SetVariable(L"BootOrder", &GV_GUID,
+ EFI_VARIABLE_NON_VOLATILE |
+ EFI_VARIABLE_BOOTSERVICE_ACCESS |
+ EFI_VARIABLE_RUNTIME_ACCESS,
+ size, newbootorder);
FreePool(newbootorder);
- return rc;
+ return efi_status;
}
EFI_STATUS
@@ -516,11 +519,11 @@ add_to_boot_list(CHAR16 *dirname, CHAR16 *filename, CHAR16 *label, CHAR16 *argum
{
CHAR16 *fullpath = NULL;
UINT64 pathlen = 0;
- EFI_STATUS rc = EFI_SUCCESS;
+ EFI_STATUS efi_status;
- rc = make_full_path(dirname, filename, &fullpath, &pathlen);
- if (EFI_ERROR(rc))
- return rc;
+ efi_status = make_full_path(dirname, filename, &fullpath, &pathlen);
+ if (EFI_ERROR(efi_status))
+ return efi_status;
EFI_DEVICE_PATH *full_device_path = NULL;
EFI_DEVICE_PATH *dp = NULL;
@@ -528,20 +531,21 @@ add_to_boot_list(CHAR16 *dirname, CHAR16 *filename, CHAR16 *label, CHAR16 *argum
full_device_path = FileDevicePath(this_image->DeviceHandle, fullpath);
if (!full_device_path) {
- rc = EFI_OUT_OF_RESOURCES;
+ efi_status = EFI_OUT_OF_RESOURCES;
goto err;
}
dps = DevicePathToStr(full_device_path);
VerbosePrint(L"file DP: %s\n", dps);
FreePool(dps);
- rc = FindSubDevicePath(full_device_path,
- MEDIA_DEVICE_PATH, MEDIA_HARDDRIVE_DP, &dp);
- if (EFI_ERROR(rc)) {
- if (rc == EFI_NOT_FOUND) {
+ efi_status = FindSubDevicePath(full_device_path,
+ MEDIA_DEVICE_PATH, MEDIA_HARDDRIVE_DP,
+ &dp);
+ if (EFI_ERROR(efi_status)) {
+ if (efi_status == EFI_NOT_FOUND) {
dp = full_device_path;
} else {
- rc = EFI_OUT_OF_RESOURCES;
+ efi_status = EFI_OUT_OF_RESOURCES;
goto err;
}
}
@@ -566,9 +570,11 @@ add_to_boot_list(CHAR16 *dirname, CHAR16 *filename, CHAR16 *label, CHAR16 *argum
}
UINT16 option;
- rc = find_boot_option(dp, full_device_path, fullpath, label, arguments, &option);
- if (EFI_ERROR(rc)) {
- add_boot_option(dp, full_device_path, fullpath, label, arguments);
+ efi_status = find_boot_option(dp, full_device_path, fullpath, label,
+ arguments, &option);
+ if (EFI_ERROR(efi_status)) {
+ add_boot_option(dp, full_device_path, fullpath, label,
+ arguments);
} else if (option != 0) {
CHAR16 *newbootorder;
newbootorder = AllocateZeroPool(sizeof (CHAR16) * nbootorder);
@@ -590,7 +596,7 @@ err:
FreePool(dp);
if (fullpath)
FreePool(fullpath);
- return rc;
+ return efi_status;
}
EFI_STATUS
@@ -628,21 +634,22 @@ try_boot_csv(EFI_FILE_HANDLE fh, CHAR16 *dirname, CHAR16 *filename)
{
CHAR16 *fullpath = NULL;
UINT64 pathlen = 0;
- EFI_STATUS rc;
+ EFI_STATUS efi_status;
- rc = make_full_path(dirname, filename, &fullpath, &pathlen);
- if (EFI_ERROR(rc))
- return rc;
+ efi_status = make_full_path(dirname, filename, &fullpath, &pathlen);
+ if (EFI_ERROR(efi_status))
+ return efi_status;
VerbosePrint(L"Found file \"%s\"\n", fullpath);
CHAR16 *buffer;
UINT64 bs;
- rc = read_file(fh, fullpath, &buffer, &bs);
- if (EFI_ERROR(rc)) {
- Print(L"Could not read file \"%s\": %d\n", fullpath, rc);
+ efi_status = read_file(fh, fullpath, &buffer, &bs);
+ if (EFI_ERROR(efi_status)) {
+ console_print(L"Could not read file \"%s\": %r\n",
+ fullpath, efi_status);
FreePool(fullpath);
- return rc;
+ return efi_status;
}
FreePool(fullpath);
@@ -685,31 +692,37 @@ try_boot_csv(EFI_FILE_HANDLE fh, CHAR16 *dirname, CHAR16 *filename)
EFI_STATUS
find_boot_csv(EFI_FILE_HANDLE fh, CHAR16 *dirname)
{
- EFI_STATUS rc;
+ EFI_STATUS efi_status;
void *buffer = NULL;
UINTN bs = 0;
- EFI_GUID finfo = EFI_FILE_INFO_ID;
/* The API here is "Call it once with bs=0, it fills in bs,
* then allocate a buffer and ask again to get it filled. */
- rc = uefi_call_wrapper(fh->GetInfo, 4, fh, &finfo, &bs, NULL);
- if (rc == EFI_BUFFER_TOO_SMALL) {
- buffer = AllocateZeroPool(bs);
- if (!buffer) {
- Print(L"Could not allocate memory\n");
- return EFI_OUT_OF_RESOURCES;
- }
- rc = uefi_call_wrapper(fh->GetInfo, 4, fh, &finfo,
- &bs, buffer);
+ efi_status = fh->GetInfo(fh, &EFI_FILE_INFO_GUID, &bs, NULL);
+ if (EFI_ERROR(efi_status) && efi_status != EFI_BUFFER_TOO_SMALL) {
+ console_print(L"Could not get directory info for \\EFI\\%s\\: %r\n",
+ dirname, efi_status);
+ return efi_status;
}
+ if (bs == 0)
+ return EFI_SUCCESS;
+
+ buffer = AllocateZeroPool(bs);
+ if (!buffer) {
+ console_print(L"Could not allocate memory\n");
+ return EFI_OUT_OF_RESOURCES;
+ }
+
+ efi_status = fh->GetInfo(fh, &EFI_FILE_INFO_GUID, &bs, buffer);
/* This checks *either* the error from the first GetInfo, if it isn't
- * the EFI_BUFFER_TOO_SMALL we're expecting, or the second GetInfo call
- * in *any* case. */
- if (EFI_ERROR(rc)) {
- Print(L"Could not get info for \"%s\": %d\n", dirname, rc);
+ * the EFI_BUFFER_TOO_SMALL we're expecting, or the second GetInfo
+ * call in *any* case. */
+ if (EFI_ERROR(efi_status)) {
+ console_print(L"Could not get info for \"%s\": %r\n", dirname,
+ efi_status);
if (buffer)
FreePool(buffer);
- return rc;
+ return efi_status;
}
EFI_FILE_INFO *fi = buffer;
@@ -725,12 +738,12 @@ find_boot_csv(EFI_FILE_HANDLE fh, CHAR16 *dirname)
bs = 0;
do {
bs = 0;
- rc = uefi_call_wrapper(fh->Read, 3, fh, &bs, NULL);
- if (EFI_ERROR(rc) && rc != EFI_BUFFER_TOO_SMALL) {
- Print(L"Could not read \\EFI\\%s\\: %d\n", dirname, rc);
- if (buffer)
- FreePool(buffer);
- return rc;
+ efi_status = fh->Read(fh, &bs, NULL);
+ if (EFI_ERROR(efi_status) &&
+ efi_status != EFI_BUFFER_TOO_SMALL) {
+ console_print(L"Could not read \\EFI\\%s\\: %r\n",
+ dirname, efi_status);
+ return efi_status;
}
/* If there's no data to read, don't try to allocate 0 bytes
* and read the data... */
@@ -739,15 +752,16 @@ find_boot_csv(EFI_FILE_HANDLE fh, CHAR16 *dirname)
buffer = AllocateZeroPool(bs);
if (!buffer) {
- Print(L"Could not allocate memory\n");
+ console_print(L"Could not allocate memory\n");
return EFI_OUT_OF_RESOURCES;
}
- rc = uefi_call_wrapper(fh->Read, 3, fh, &bs, buffer);
- if (EFI_ERROR(rc)) {
- Print(L"Could not read \\EFI\\%s\\: %d\n", dirname, rc);
+ efi_status = fh->Read(fh, &bs, buffer);
+ if (EFI_ERROR(efi_status)) {
+ console_print(L"Could not read \\EFI\\%s\\: %r\n",
+ dirname, efi_status);
FreePool(buffer);
- return rc;
+ return efi_status;
}
if (bs == 0)
@@ -766,105 +780,108 @@ find_boot_csv(EFI_FILE_HANDLE fh, CHAR16 *dirname)
buffer = NULL;
} while (bs != 0);
- rc = EFI_SUCCESS;
+ efi_status = EFI_SUCCESS;
if (bootarchcsv) {
EFI_FILE_HANDLE fh2;
- rc = uefi_call_wrapper(fh->Open, 5, fh, &fh2,
- bootarchcsv, EFI_FILE_READ_ONLY, 0);
- if (EFI_ERROR(rc) || fh2 == NULL) {
- Print(L"Couldn't open \\EFI\\%s\\%s: %d\n",
- dirname, bootarchcsv, rc);
+ efi_status = fh->Open(fh, &fh2, bootarchcsv,
+ EFI_FILE_READ_ONLY, 0);
+ if (EFI_ERROR(efi_status) || fh2 == NULL) {
+ console_print(L"Couldn't open \\EFI\\%s\\%s: %r\n",
+ dirname, bootarchcsv, efi_status);
} else {
- rc = try_boot_csv(fh2, dirname, bootarchcsv);
- uefi_call_wrapper(fh2->Close, 1, fh2);
+ efi_status = try_boot_csv(fh2, dirname, bootarchcsv);
+ fh2->Close(fh2);
+ if (EFI_ERROR(efi_status))
+ console_print(L"Could not process \\EFI\\%s\\%s: %r\n",
+ dirname, bootarchcsv, efi_status);
}
}
- if ((EFI_ERROR(rc) || !bootarchcsv) && bootcsv) {
+ if ((EFI_ERROR(efi_status) || !bootarchcsv) && bootcsv) {
EFI_FILE_HANDLE fh2;
- rc = uefi_call_wrapper(fh->Open, 5, fh, &fh2,
- bootcsv, EFI_FILE_READ_ONLY, 0);
- if (EFI_ERROR(rc) || fh2 == NULL) {
- Print(L"Couldn't open \\EFI\\%s\\%s: %d\n",
- dirname, bootcsv, rc);
+ efi_status = fh->Open(fh, &fh2, bootcsv,
+ EFI_FILE_READ_ONLY, 0);
+ if (EFI_ERROR(efi_status) || fh2 == NULL) {
+ console_print(L"Couldn't open \\EFI\\%s\\%s: %r\n",
+ dirname, bootcsv, efi_status);
} else {
- rc = try_boot_csv(fh2, dirname, bootcsv);
- uefi_call_wrapper(fh2->Close, 1, fh2);
+ efi_status = try_boot_csv(fh2, dirname, bootcsv);
+ fh2->Close(fh2);
+ if (EFI_ERROR(efi_status))
+ console_print(L"Could not process \\EFI\\%s\\%s: %r\n",
+ dirname, bootarchcsv, efi_status);
}
}
- rc = EFI_SUCCESS;
-
- return rc;
+ return EFI_SUCCESS;
}
EFI_STATUS
find_boot_options(EFI_HANDLE device)
{
- EFI_STATUS rc = EFI_SUCCESS;
-
+ EFI_STATUS efi_status;
EFI_FILE_IO_INTERFACE *fio = NULL;
- rc = uefi_call_wrapper(BS->HandleProtocol, 3, device,
- &FileSystemProtocol, (void **)&fio);
- if (EFI_ERROR(rc)) {
- Print(L"Couldn't find file system: %d\n", rc);
- return rc;
+
+ efi_status = gBS->HandleProtocol(device, &FileSystemProtocol,
+ (void **) &fio);
+ if (EFI_ERROR(efi_status)) {
+ console_print(L"Couldn't find file system: %r\n", efi_status);
+ return efi_status;
}
/* EFI_FILE_HANDLE is a pointer to an EFI_FILE, and I have
* *no idea* what frees the memory allocated here. Hopefully
* Close() does. */
EFI_FILE_HANDLE fh = NULL;
- rc = uefi_call_wrapper(fio->OpenVolume, 2, fio, &fh);
- if (EFI_ERROR(rc) || fh == NULL) {
- Print(L"Couldn't open file system: %d\n", rc);
- return rc;
+ efi_status = fio->OpenVolume(fio, &fh);
+ if (EFI_ERROR(efi_status) || fh == NULL) {
+ console_print(L"Couldn't open file system: %r\n", efi_status);
+ return efi_status;
}
EFI_FILE_HANDLE fh2 = NULL;
- rc = uefi_call_wrapper(fh->Open, 5, fh, &fh2, L"EFI",
- EFI_FILE_READ_ONLY, 0);
- if (EFI_ERROR(rc) || fh2 == NULL) {
- Print(L"Couldn't open EFI: %d\n", rc);
- uefi_call_wrapper(fh->Close, 1, fh);
- return rc;
+ efi_status = fh->Open(fh, &fh2, L"EFI", EFI_FILE_READ_ONLY, 0);
+ if (EFI_ERROR(efi_status) || fh2 == NULL) {
+ console_print(L"Couldn't open EFI: %r\n", efi_status);
+ fh->Close(fh);
+ return efi_status;
}
- rc = uefi_call_wrapper(fh2->SetPosition, 2, fh2, 0);
- if (EFI_ERROR(rc)) {
- Print(L"Couldn't set file position: %d\n", rc);
- uefi_call_wrapper(fh2->Close, 1, fh2);
- uefi_call_wrapper(fh->Close, 1, fh);
- return rc;
+ efi_status = fh2->SetPosition(fh2, 0);
+ if (EFI_ERROR(efi_status)) {
+ console_print(L"Couldn't set file position: %r\n", efi_status);
+ fh2->Close(fh2);
+ fh->Close(fh);
+ return efi_status;
}
void *buffer;
UINTN bs;
do {
bs = 0;
- rc = uefi_call_wrapper(fh2->Read, 3, fh2, &bs, NULL);
- if (rc == EFI_BUFFER_TOO_SMALL ||
- (rc == EFI_SUCCESS && bs != 0)) {
- buffer = AllocateZeroPool(bs);
- if (!buffer) {
- Print(L"Could not allocate memory\n");
- /* sure, this might work, why not? */
- uefi_call_wrapper(fh2->Close, 1, fh2);
- uefi_call_wrapper(fh->Close, 1, fh);
- return EFI_OUT_OF_RESOURCES;
- }
-
- rc = uefi_call_wrapper(fh2->Read, 3, fh2, &bs, buffer);
+ efi_status = fh2->Read(fh2, &bs, NULL);
+ if (EFI_ERROR(efi_status) && efi_status != EFI_BUFFER_TOO_SMALL) {
+ console_print(L"Could not read \\EFI\\: %r\n", efi_status);
+ return efi_status;
}
if (bs == 0)
break;
- if (EFI_ERROR(rc)) {
- Print(L"Could not read \\EFI\\: %d\n", rc);
+ buffer = AllocateZeroPool(bs);
+ if (!buffer) {
+ console_print(L"Could not allocate memory\n");
+ /* sure, this might work, why not? */
+ fh2->Close(fh2);
+ fh->Close(fh);
+ return EFI_OUT_OF_RESOURCES;
+ }
+
+ efi_status = fh2->Read(fh2, &bs, buffer);
+ if (EFI_ERROR(efi_status)) {
if (buffer) {
FreePool(buffer);
buffer = NULL;
}
- uefi_call_wrapper(fh2->Close, 1, fh2);
- uefi_call_wrapper(fh->Close, 1, fh);
- return rc;
+ fh2->Close(fh2);
+ fh->Close(fh);
+ return efi_status;
}
EFI_FILE_INFO *fi = buffer;
@@ -883,74 +900,77 @@ find_boot_options(EFI_HANDLE device)
VerbosePrint(L"Found directory named \"%s\"\n", fi->FileName);
EFI_FILE_HANDLE fh3;
- rc = uefi_call_wrapper(fh->Open, 5, fh2, &fh3, fi->FileName,
- EFI_FILE_READ_ONLY, 0);
- if (EFI_ERROR(rc)) {
- Print(L"%d Couldn't open %s: %d\n", __LINE__, fi->FileName, rc);
+ efi_status = fh2->Open(fh2, &fh3, fi->FileName,
+ EFI_FILE_READ_ONLY, 0);
+ if (EFI_ERROR(efi_status)) {
+ console_print(L"%d Couldn't open %s: %r\n", __LINE__,
+ fi->FileName, efi_status);
FreePool(buffer);
buffer = NULL;
continue;
}
- rc = find_boot_csv(fh3, fi->FileName);
+ efi_status = find_boot_csv(fh3, fi->FileName);
+ fh3->Close(fh3);
FreePool(buffer);
buffer = NULL;
- if (rc == EFI_OUT_OF_RESOURCES)
+ if (efi_status == EFI_OUT_OF_RESOURCES)
break;
} while (1);
- if (rc == EFI_SUCCESS && nbootorder > 0)
- rc = update_boot_order();
+ if (!EFI_ERROR(efi_status) && nbootorder > 0)
+ efi_status = update_boot_order();
- uefi_call_wrapper(fh2->Close, 1, fh2);
- uefi_call_wrapper(fh->Close, 1, fh);
- return rc;
+ fh2->Close(fh2);
+ fh->Close(fh);
+ return efi_status;
}
static EFI_STATUS
try_start_first_option(EFI_HANDLE parent_image_handle)
{
- EFI_STATUS rc;
+ EFI_STATUS efi_status;
EFI_HANDLE image_handle;
if (!first_new_option) {
return EFI_SUCCESS;
}
- rc = uefi_call_wrapper(BS->LoadImage, 6, 0, parent_image_handle,
- first_new_option, NULL, 0,
- &image_handle);
- if (EFI_ERROR(rc)) {
+ efi_status = gBS->LoadImage(0, parent_image_handle, first_new_option,
+ NULL, 0, &image_handle);
+ if (EFI_ERROR(efi_status)) {
CHAR16 *dps = DevicePathToStr(first_new_option);
UINTN s = DevicePathSize(first_new_option);
unsigned int i;
UINT8 *dpv = (void *)first_new_option;
- Print(L"LoadImage failed: %d\nDevice path: \"%s\"\n", rc, dps);
+ console_print(L"LoadImage failed: %r\nDevice path: \"%s\"\n",
+ efi_status, dps);
for (i = 0; i < s; i++) {
if (i > 0 && i % 16 == 0)
- Print(L"\n");
- Print(L"%02x ", dpv[i]);
+ console_print(L"\n");
+ console_print(L"%02x ", dpv[i]);
}
- Print(L"\n");
+ console_print(L"\n");
- uefi_call_wrapper(BS->Stall, 1, 500000000);
- return rc;
+ msleep(500000000);
+ return efi_status;
}
EFI_LOADED_IMAGE *image;
- rc = uefi_call_wrapper(BS->HandleProtocol, 3, image_handle, &LoadedImageProtocol, (void *)&image);
- if (!EFI_ERROR(rc)) {
+ efi_status = gBS->HandleProtocol(image_handle, &LoadedImageProtocol,
+ (void *) &image);
+ if (!EFI_ERROR(efi_status)) {
image->LoadOptions = first_new_option_args;
image->LoadOptionsSize = first_new_option_size;
}
- rc = uefi_call_wrapper(BS->StartImage, 3, image_handle, NULL, NULL);
- if (EFI_ERROR(rc)) {
- Print(L"StartImage failed: %d\n", rc);
- uefi_call_wrapper(BS->Stall, 1, 500000000);
+ efi_status = gBS->StartImage(image_handle, NULL, NULL);
+ if (EFI_ERROR(efi_status)) {
+ console_print(L"StartImage failed: %r\n", efi_status);
+ msleep(500000000);
}
- return rc;
+ return efi_status;
}
extern EFI_STATUS
@@ -960,31 +980,33 @@ static void
__attribute__((__optimize__("0")))
debug_hook(void)
{
- EFI_GUID guid = SHIM_LOCK_GUID;
UINT8 *data = NULL;
UINTN dataSize = 0;
EFI_STATUS efi_status;
volatile register int x = 0;
extern char _etext, _edata;
- efi_status = get_variable(L"SHIM_DEBUG", &data, &dataSize, guid);
+ efi_status = get_variable(L"SHIM_DEBUG", &data, &dataSize,
+ SHIM_LOCK_GUID);
if (EFI_ERROR(efi_status)) {
return;
}
+ if (data)
+ FreePool(data);
if (x)
return;
x = 1;
- Print(L"add-symbol-file "DEBUGDIR
- L"fb" EFI_ARCH L".efi.debug %p -s .data %p\n", &_etext,
- &_edata);
+ console_print(L"add-symbol-file "DEBUGDIR
+ L"fb" EFI_ARCH L".efi.debug %p -s .data %p\n",
+ &_etext, &_edata);
}
EFI_STATUS
efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *systab)
{
- EFI_STATUS rc;
+ EFI_STATUS efi_status;
InitializeLib(image, systab);
@@ -993,39 +1015,41 @@ efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *systab)
*/
debug_hook();
- rc = uefi_call_wrapper(BS->HandleProtocol, 3, image, &LoadedImageProtocol, (void *)&this_image);
- if (EFI_ERROR(rc)) {
- Print(L"Error: could not find loaded image: %d\n", rc);
- return rc;
+ efi_status = gBS->HandleProtocol(image, &LoadedImageProtocol,
+ (void *) &this_image);
+ if (EFI_ERROR(efi_status)) {
+ console_print(L"Error: could not find loaded image: %r\n",
+ efi_status);
+ return efi_status;
}
- Print(L"System BootOrder not found. Initializing defaults.\n");
+ console_print(L"System BootOrder not found. Initializing defaults.\n");
set_boot_order();
- rc = find_boot_options(this_image->DeviceHandle);
- if (EFI_ERROR(rc)) {
- Print(L"Error: could not find boot options: %d\n", rc);
- return rc;
+ efi_status = find_boot_options(this_image->DeviceHandle);
+ if (EFI_ERROR(efi_status)) {
+ console_print(L"Error: could not find boot options: %r\n",
+ efi_status);
+ return efi_status;
}
- rc = fallback_should_prefer_reset();
- if (EFI_ERROR(rc)) {
+ efi_status = fallback_should_prefer_reset();
+ if (EFI_ERROR(efi_status)) {
VerbosePrint(L"tpm not present, starting the first image\n");
try_start_first_option(image);
} else {
VerbosePrint(L"tpm present, resetting system\n");
}
- Print(L"Reset System\n");
+ console_print(L"Reset System\n");
if (get_fallback_verbose()) {
- Print(L"Verbose enabled, sleeping for half a second\n");
- uefi_call_wrapper(BS->Stall, 1, 500000);
+ console_print(L"Verbose enabled, sleeping for half a second\n");
+ msleep(500000);
}
- uefi_call_wrapper(RT->ResetSystem, 4, EfiResetCold,
- EFI_SUCCESS, 0, NULL);
+ gRT->ResetSystem(EfiResetCold, EFI_SUCCESS, 0, NULL);
return EFI_SUCCESS;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-09-08 04:57:01 +0000