| Message ID | 20180618140835.195901-19-sjg@chromium.org |
|---|---|
| State | Superseded |
| Delegated to: | Alexander Graf |
| Headers | show |
| Series | efi: Enable sandbox support for EFI loader | expand |
On 06/18/2018 04:08 PM, Simon Glass wrote: > The test should exit like any other EFI application, by calling exit() > in the boot services API. But this crashes at present on sandbox. For now, > add in the placeholder code. > > Signed-off-by: Simon Glass <sjg@chromium.org> It crashes because setjmp/longjmp are broken. See my patch set. Alex
Hi Alex, On 18 June 2018 at 08:51, Alexander Graf <agraf@suse.de> wrote: > On 06/18/2018 04:08 PM, Simon Glass wrote: >> >> The test should exit like any other EFI application, by calling exit() >> in the boot services API. But this crashes at present on sandbox. For now, >> add in the placeholder code. >> >> Signed-off-by: Simon Glass <sjg@chromium.org> > > > It crashes because setjmp/longjmp are broken. See my patch set. Yes that's right. But I'd like to enable this code once your patch is in. Regards, Simon
diff --git a/lib/efi_loader/efi_test.c b/lib/efi_loader/efi_test.c index 4b8d49f324..5401a0f471 100644 --- a/lib/efi_loader/efi_test.c +++ b/lib/efi_loader/efi_test.c @@ -9,8 +9,18 @@ int efi_test(efi_handle_t image_handle, struct efi_system_table *systable) { struct efi_simple_text_output_protocol *con_out = systable->con_out; + struct efi_boot_services *boottime = systable->boottime; + int ret; - con_out->output_string(con_out, L"Hello, world!\n"); + ret = con_out->output_string(con_out, L"Hello, world!\n"); + + /* + * We should really call EFI's exit() here but this crashes at present + * on sandbox due to the incorrect use of setjmp() and longjmp(). Once + * we can figure out how to make that work, this can be enabled. + */ + if (0) + boottime->exit(image_handle, ret, 0, NULL); return 0; }
The test should exit like any other EFI application, by calling exit() in the boot services API. But this crashes at present on sandbox. For now, add in the placeholder code. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v8: None Changes in v7: None Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None lib/efi_loader/efi_test.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)