efi_loader: capsule: return a corret error code at find_boot_device()

Message ID 20210420010316.9716-1-takahiro.akashi@linaro.org
State Accepted
Commit 2c1a6840495eb1ab90c8d5cf7e057f793d84dc16
Headers show
Series
  • efi_loader: capsule: return a corret error code at find_boot_device()
Related show

Commit Message

AKASHI Takahiro April 20, 2021, 1:03 a.m.
In case of failure at efi_get_variable_int("BootOrder"), we should
skip examining boot option variables and return an appropriate error
code which is the one the function returned.

Fixes: CID 331153 Code maintainability issues  (UNUSED_VALUE)
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>

---
 lib/efi_loader/efi_capsule.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.31.0

Comments

Heinrich Schuchardt April 20, 2021, 6:17 a.m. | #1
On 4/20/21 3:03 AM, AKASHI Takahiro wrote:
> In case of failure at efi_get_variable_int("BootOrder"), we should

> skip examining boot option variables and return an appropriate error

> code which is the one the function returned.

>

> Fixes: CID 331153 Code maintainability issues  (UNUSED_VALUE)

> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>


Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>


> ---

>   lib/efi_loader/efi_capsule.c | 2 +-

>   1 file changed, 1 insertion(+), 1 deletion(-)

>

> diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c

> index 691eda5e0d14..2d10f47bff24 100644

> --- a/lib/efi_loader/efi_capsule.c

> +++ b/lib/efi_loader/efi_capsule.c

> @@ -685,7 +685,6 @@ skip:

>   		efi_free_pool(boot_dev);

>   		boot_dev = NULL;

>   	}

> -out:

>   	if (boot_dev) {

>   		u16 *path_str;

>

> @@ -703,6 +702,7 @@ out:

>   	} else {

>   		ret = EFI_NOT_FOUND;

>   	}

> +out:

>   	free(boot_order);

>

>   	return ret;

>

Patch

diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c
index 691eda5e0d14..2d10f47bff24 100644
--- a/lib/efi_loader/efi_capsule.c
+++ b/lib/efi_loader/efi_capsule.c
@@ -685,7 +685,6 @@  skip:
 		efi_free_pool(boot_dev);
 		boot_dev = NULL;
 	}
-out:
 	if (boot_dev) {
 		u16 *path_str;
 
@@ -703,6 +702,7 @@  out:
 	} else {
 		ret = EFI_NOT_FOUND;
 	}
+out:
 	free(boot_order);
 
 	return ret;