]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
efi_loader: capsule: return a correct error code at find_boot_device()
authorAKASHI Takahiro <takahiro.akashi@linaro.org>
Tue, 20 Apr 2021 01:03:16 +0000 (10:03 +0900)
committerHeinrich Schuchardt <xypron.glpk@gmx.de>
Sat, 24 Apr 2021 04:53:40 +0000 (06:53 +0200)
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

index a984c347e1efd15d86d48f9434e3bf1a904b283b..6ee883d5b1169a402f87259dfbcf9c2fb11482f4 100644 (file)
@@ -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;