proxmox-mirrors/efi-boot-shim
1
0
Fork 0
mirror of https://git.proxmox.com/git/efi-boot-shim synced 2025-06-12 11:16:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

shim: dealing with only one string on loadoption

Browse Source 
The second stage set is not working after commit
3322257e61 for those which load option
only have one string.

Signed-off-by: Ivan Hu <ivan.hu@canonical.com>
This commit is contained in:
Ivan Hu 2016-05-10 13:53:24 +08:00 committed by Peter Jones
parent 8f1bd605d0
commit 085d56c464
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
shim.c
View File

@ -2168,6 +2168,18 @@ EFI_STATUS set_second_stage (EFI_HANDLE image_handle)
*
* which is clearly an EFI_LOAD_OPTION filled in halfway reasonably.
* In short, the UEFI shell is still a useless piece of junk.
*
* But then on some versions of BDS, we get:
00000000 5c 00 66 00 77 00 75 00 70 00 78 00 36 00 34 00 |\.f.w.u.p.x.6.4.|
00000010 2e 00 65 00 66 00 69 00 00 00 |..e.f.i...|
0000001a
* which as you can see is one perfectly normal UCS2-EL string
* containing the load option from the Boot#### variable.
*
* We also sometimes find a guid or partial guid at the end, because
* BDS will add that, but we ignore that here.
*/
/*
@ -2252,6 +2264,10 @@ EFI_STATUS set_second_stage (EFI_HANDLE image_handle)
}
if (loader_len)
remaining_size -= loader_len;
} else {
/* only find one string */
start = li->LoadOptions;
loader_len = li->LoadOptionsSize;
}
/*