Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20200216184050.3100-1-xypron.glpk@gmx.de>
In-Reply-To: <20200216184050.3100-1-xypron.glpk@gmx.de>
From:   Ard Biesheuvel <ardb@kernel.org>
Date:   Mon, 17 Feb 2020 09:37:46 +0100
Message-ID: <CAKv+Gu_zevqzHRPMQaEcAeLPCYrTCLtbTbrZ2Ajz+ooYDb3m3A@mail.gmail.com>
Subject: Re: [PATCH 1/1] efi/libstub: simplify efi_get_memory_map()
To:     Heinrich Schuchardt <xypron.glpk@gmx.de>
Cc:     linux-efi <linux-efi@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Sun, 16 Feb 2020 at 19:40, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
>
> Do not check the value of status twice.
>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

Thanks, I'll queue this one as well.

> ---
>  drivers/firmware/efi/libstub/mem.c | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/firmware/efi/libstub/mem.c b/drivers/firmware/efi/libstub/mem.c
> index c6a784ed640f..c25fd9174b74 100644
> --- a/drivers/firmware/efi/libstub/mem.c
> +++ b/drivers/firmware/efi/libstub/mem.c
> @@ -52,13 +52,14 @@ efi_status_t efi_get_memory_map(struct efi_boot_memmap *map)
>                 goto again;
>         }
>
> -       if (status != EFI_SUCCESS)
> +       if (status == EFI_SUCCESS) {
> +               if (map->key_ptr)
> +                       *map->key_ptr = key;
> +               if (map->desc_ver)
> +                       *map->desc_ver = desc_version;
> +       } else {
>                 efi_bs_call(free_pool, m);
> -
> -       if (map->key_ptr && status == EFI_SUCCESS)
> -               *map->key_ptr = key;
> -       if (map->desc_ver && status == EFI_SUCCESS)
> -               *map->desc_ver = desc_version;
> +       }
>
>  fail:
>         *map->map = m;
> --
> 2.25.0
>