| Message ID | 20170825175314.822-1-xypron.glpk@gmx.de |
|---|---|
| State | Accepted |
| Commit | da94073b42cad349879ae5741e0b0fb3ac59a067 |
| Delegated to: | Alexander Graf |
| Headers | show |
On Fri, Aug 25, 2017 at 1:53 PM, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote: > The calls to __efi_entry_check and __efi_exit_check have to match. > If DEBUG is defined, panic() will be called otherwise. > > If debugging is activated some Travis CI builds fail due to an > assertion in EFI_CALL without the patch. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Thanks, Reviewed-by: Rob Clark <robdclark@gmail.com> > --- > lib/efi_loader/efi_boottime.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c > index 5444b32530..ef3ae05126 100644 > --- a/lib/efi_loader/efi_boottime.c > +++ b/lib/efi_loader/efi_boottime.c > @@ -828,6 +828,8 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle, > EFI_ENTRY("%p, %ld, %ld, %p", image_handle, exit_status, > exit_data_size, exit_data); > > + __efi_exit_check(); > + > loaded_image_info->exit_status = exit_status; > longjmp(&loaded_image_info->exit_jmp, 1); > > -- > 2.14.1 >
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 5444b32530..ef3ae05126 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -828,6 +828,8 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle, EFI_ENTRY("%p, %ld, %ld, %p", image_handle, exit_status, exit_data_size, exit_data); + __efi_exit_check(); + loaded_image_info->exit_status = exit_status; longjmp(&loaded_image_info->exit_jmp, 1);
The calls to __efi_entry_check and __efi_exit_check have to match. If DEBUG is defined, panic() will be called otherwise. If debugging is activated some Travis CI builds fail due to an assertion in EFI_CALL without the patch. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- lib/efi_loader/efi_boottime.c | 2 ++ 1 file changed, 2 insertions(+)