Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200426194946.112768-1-xypron.glpk@gmx.de>
In-Reply-To: <20200426194946.112768-1-xypron.glpk@gmx.de>
From:   Ard Biesheuvel <ardb@kernel.org>
Date:   Mon, 27 Apr 2020 08:52:29 +0200
Message-ID: <CAMj1kXHo+utD4Y2BT0kcefEtYUKZsEWvqgzMNcJy0GE3Cw3jGA@mail.gmail.com>
Subject: Re: [PATCH 1/1] efi/libstub: setup_graphics() do not return random data
To:     Heinrich Schuchardt <xypron.glpk@gmx.de>
Cc:     Ingo Molnar <mingo@kernel.org>,
        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, 26 Apr 2020 at 21:49, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
>
> Currently setup_graphics() ignores the return value of efi_setup_gop(). As
> AllocatePool() does not zero out memory the screen information table will
> contain random data in this case.
>
> We should free the screen information table if efi_setup_gop() returns an
> error code.
>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

Thanks Heinrich

I will take this as a fix


> ---
>  drivers/firmware/efi/libstub/efi-stub.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/efi/libstub/efi-stub.c b/drivers/firmware/efi/libstub/efi-stub.c
> index ee225b323687..60377e5ceab3 100644
> --- a/drivers/firmware/efi/libstub/efi-stub.c
> +++ b/drivers/firmware/efi/libstub/efi-stub.c
> @@ -55,7 +55,11 @@ static struct screen_info *setup_graphics(void)
>                 si = alloc_screen_info();
>                 if (!si)
>                         return NULL;
> -               efi_setup_gop(si, &gop_proto, size);
> +               status = efi_setup_gop(si, &gop_proto, size);
> +               if (status != EFI_SUCCESS) {
> +                       free_screen_info(si);
> +                       return NULL;
> +               }
>         }
>         return si;
>  }
> --
> 2.26.2
>