xen/efi: Update error flow for read_file function
PATCH v5 1/1 xen/efi: Update error flow for read_file function
Use more explicit goto statements to handle common error code path instead of a lot of if/else.
Signed-off-by Frediano Ziglio <[email protected]>
---
Change since v4:
- fixed label indentation.
--- xen/common/efi/boot.c | 80 +++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 37 deletions(-)
xen/common/efi/boot.c +43 -37
@@ -792,6 +792,8 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name,if ( !name )PrintErrMesg (L"No filename" ,EFI_OUT_OF_RESOURCES ); + + what =L"Open" ;if ( dir_handle ) ret = dir_handle->Open (dir_handle, &FileHandle, name,EFI_FILE_MODE_READ ,0 );
@@ -800,54 +802,58 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name,if ( file == &cfg && ret ==EFI_NOT_FOUND )return false;if (EFI_ERROR (ret) ) - what =L"Open" ; -else - ret = FileHandle->SetPosition (FileHandle,-1 ); + goto fail; + + what =L"Seek" ; + ret = FileHandle->SetPosition (FileHandle,-1 );if (EFI_ERROR (ret) ) - what = what ?:L"Seek" ; -else - ret = FileHandle->GetPosition (FileHandle, &size); + goto fail; + + what =L"Get size" ; + ret = FileHandle->GetPosition (FileHandle, &size);if (EFI_ERROR (ret) ) - what = what ?:L"Get size" ; -else - ret = FileHandle->SetPosition (FileHandle,0 ); + goto fail; + + what =L"Seek" ; + ret = FileHandle->SetPosition (FileHandle,0 );if (EFI_ERROR (ret) ) - what = what ?:L"Seek" ; -else - { - file->addr =min (1UL << (32 +PAGE_SHIFT ), -HYPERVISOR_VIRT_END -DIRECTMAP_VIRT_START ); - ret = efi_bs->AllocatePages (AllocateMaxAddress, EfiLoaderData, -PFN_UP (size), &file->addr); - } + goto fail; + + what =L"Allocation" ; + file->addr =min (1UL << (32 +PAGE_SHIFT ), +HYPERVISOR_VIRT_END -DIRECTMAP_VIRT_START ); + ret = efi_bs->AllocatePages (AllocateMaxAddress, EfiLoaderData, +PFN_UP (size), &file->addr);if (EFI_ERROR (ret) ) - what = what ?:L"Allocation" ; -else - { - file->need_to_free = true; - file->size = size; -handle_file_info (name, file, options); + goto fail; - ret = FileHandle->Read (FileHandle, &file->size, file->str); -if ( !EFI_ERROR (ret) && file->size != size ) - ret =EFI_ABORTED ; -if (EFI_ERROR (ret) ) - what =L"Read" ; - } + file->need_to_free = true; + file->size = size; +handle_file_info (name, file, options); -if ( FileHandle ) - FileHandle->Close (FileHandle); + what =L"Read" ; + ret = FileHandle->Read (FileHandle, &file->size, file->str); +if ( !EFI_ERROR (ret) && file->size != size ) + ret =EFI_ABORTED ; +if (EFI_ERROR (ret) ) + goto fail; -if ( what ) - { -PrintErr (what); -PrintErr (L" failed for " ); -PrintErrMesg (name, ret); - } + FileHandle->Close (FileHandle);efi_arch_flush_dcache_area (file->ptr, file->size);return true; + + fail: +if ( FileHandle ) + FileHandle->Close (FileHandle); + +PrintErr (what); +PrintErr (L" failed for " ); +PrintErrMesg (name, ret); + +/* not reached */ +return false; } static bool __init read_section(const EFI_LOADED_IMAGE *image,
Signature · 1 line
2.43.0
Quoted 111 lines · Frediano Ziglio
Use more explicit goto statements to handle common error code path instead of a lot of if/else.
Signed-off-by Frediano Ziglio <[email protected]>---
Change since v4:
- fixed label indentation.--- xen/common/efi/boot.c | 80 +++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 37 deletions(-)xen/common/efi/boot.c +36
-37@@ -792,6 +792,8 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name,if ( !name )PrintErrMesg (L"No filename" ,EFI_OUT_OF_RESOURCES ); + + what =L"Open" ;if ( dir_handle ) ret = dir_handle->Open (dir_handle, &FileHandle, name,EFI_FILE_MODE_READ ,0 );@@ -800,54 +802,58 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name,if ( file == &cfg && ret ==EFI_NOT_FOUND )return false;if (EFI_ERROR (ret) ) - what =L"Open" ; -else - ret = FileHandle->SetPosition (FileHandle,-1 ); + goto fail; + + what =L"Seek" ; + ret = FileHandle->SetPosition (FileHandle,-1 );if (EFI_ERROR (ret) ) - what = what ?:L"Seek" ; -else - ret = FileHandle->GetPosition (FileHandle, &size); + goto fail; + + what =L"Get size" ; + ret = FileHandle->GetPosition (FileHandle, &size);if (EFI_ERROR (ret) ) - what = what ?:L"Get size" ; -else - ret = FileHandle->SetPosition (FileHandle,0 ); + goto fail; + + what =L"Seek" ; + ret = FileHandle->SetPosition (FileHandle,0 );if (EFI_ERROR (ret) ) - what = what ?:L"Seek" ; -else - { - file->addr =min (1UL << (32 +PAGE_SHIFT ), -HYPERVISOR_VIRT_END -DIRECTMAP_VIRT_START ); - ret = efi_bs->AllocatePages (AllocateMaxAddress, EfiLoaderData, -PFN_UP (size), &file->addr); - } + goto fail; + + what =L"Allocation" ; + file->addr =min (1UL << (32 +PAGE_SHIFT ), +HYPERVISOR_VIRT_END -DIRECTMAP_VIRT_START ); + ret = efi_bs->AllocatePages (AllocateMaxAddress, EfiLoaderData, +PFN_UP (size), &file->addr);if (EFI_ERROR (ret) ) - what = what ?:L"Allocation" ; -else - { - file->need_to_free = true; - file->size = size; -handle_file_info (name, file, options); + goto fail; - ret = FileHandle->Read (FileHandle, &file->size, file->str); -if ( !EFI_ERROR (ret) && file->size != size ) - ret =EFI_ABORTED ; -if (EFI_ERROR (ret) ) - what =L"Read" ; - } + file->need_to_free = true; + file->size = size; +handle_file_info (name, file, options); -if ( FileHandle ) - FileHandle->Close (FileHandle); + what =L"Read" ; + ret = FileHandle->Read (FileHandle, &file->size, file->str); +if ( !EFI_ERROR (ret) && file->size != size ) + ret =EFI_ABORTED ; +if (EFI_ERROR (ret) ) + goto fail; -if ( what ) - { -PrintErr (what); -PrintErr (L" failed for " ); -PrintErrMesg (name, ret); - } + FileHandle->Close (FileHandle);efi_arch_flush_dcache_area (file->ptr, file->size);return true; + + fail: +if ( FileHandle ) + FileHandle->Close (FileHandle);
xen/common/efi/boot.c static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, · line 859
Quoted 10 lines
xen/common/efi/boot.c +7
-0+ +PrintErr (what); +PrintErr (L" failed for " ); +PrintErrMesg (name, ret); + +/* not reached */ +return false; } static bool __init read_section(const EFI_LOADED_IMAGE *image,
Comments on this?
Frediano
Quoted 4 lines · Frediano Ziglio
Use more explicit goto statements to handle common error code path instead of a lot of if/else.
Signed-off-by Frediano Ziglio <[email protected]>
Reviewed-by Marek Marczykowski-Górecki <[email protected]>
Quoted 119 lines
---
Change since v4:
- fixed label indentation.--- xen/common/efi/boot.c | 80 +++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 37 deletions(-)xen/common/efi/boot.c +43
-37@@ -792,6 +792,8 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name,if ( !name )PrintErrMesg (L"No filename" ,EFI_OUT_OF_RESOURCES ); + + what =L"Open" ;if ( dir_handle ) ret = dir_handle->Open (dir_handle, &FileHandle, name,EFI_FILE_MODE_READ ,0 );@@ -800,54 +802,58 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name,if ( file == &cfg && ret ==EFI_NOT_FOUND )return false;if (EFI_ERROR (ret) ) - what =L"Open" ; -else - ret = FileHandle->SetPosition (FileHandle,-1 ); + goto fail; + + what =L"Seek" ; + ret = FileHandle->SetPosition (FileHandle,-1 );if (EFI_ERROR (ret) ) - what = what ?:L"Seek" ; -else - ret = FileHandle->GetPosition (FileHandle, &size); + goto fail; + + what =L"Get size" ; + ret = FileHandle->GetPosition (FileHandle, &size);if (EFI_ERROR (ret) ) - what = what ?:L"Get size" ; -else - ret = FileHandle->SetPosition (FileHandle,0 ); + goto fail; + + what =L"Seek" ; + ret = FileHandle->SetPosition (FileHandle,0 );if (EFI_ERROR (ret) ) - what = what ?:L"Seek" ; -else - { - file->addr =min (1UL << (32 +PAGE_SHIFT ), -HYPERVISOR_VIRT_END -DIRECTMAP_VIRT_START ); - ret = efi_bs->AllocatePages (AllocateMaxAddress, EfiLoaderData, -PFN_UP (size), &file->addr); - } + goto fail; + + what =L"Allocation" ; + file->addr =min (1UL << (32 +PAGE_SHIFT ), +HYPERVISOR_VIRT_END -DIRECTMAP_VIRT_START ); + ret = efi_bs->AllocatePages (AllocateMaxAddress, EfiLoaderData, +PFN_UP (size), &file->addr);if (EFI_ERROR (ret) ) - what = what ?:L"Allocation" ; -else - { - file->need_to_free = true; - file->size = size; -handle_file_info (name, file, options); + goto fail; - ret = FileHandle->Read (FileHandle, &file->size, file->str); -if ( !EFI_ERROR (ret) && file->size != size ) - ret =EFI_ABORTED ; -if (EFI_ERROR (ret) ) - what =L"Read" ; - } + file->need_to_free = true; + file->size = size; +handle_file_info (name, file, options); -if ( FileHandle ) - FileHandle->Close (FileHandle); + what =L"Read" ; + ret = FileHandle->Read (FileHandle, &file->size, file->str); +if ( !EFI_ERROR (ret) && file->size != size ) + ret =EFI_ABORTED ; +if (EFI_ERROR (ret) ) + goto fail; -if ( what ) - { -PrintErr (what); -PrintErr (L" failed for " ); -PrintErrMesg (name, ret); - } + FileHandle->Close (FileHandle);efi_arch_flush_dcache_area (file->ptr, file->size);return true; + + fail: +if ( FileHandle ) + FileHandle->Close (FileHandle); + +PrintErr (what); +PrintErr (L" failed for " ); +PrintErrMesg (name, ret); + +/* not reached */ +return false; } static bool __init read_section(const EFI_LOADED_IMAGE *image,Signature · 1 line
2.43.0
Signature · 3 lines
Best Regards, Marek Marczykowski-Górecki Invisible Things Lab