From: "tip-bot2 for Heinrich Schuchardt" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>,
Ard Biesheuvel <ardb@kernel.org>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: efi/urgent] efi/libstub: Avoid returning uninitialized data from setup_graphics()
Date: Fri, 22 May 2020 18:30:18 -0000 [thread overview]
Message-ID: <159017221803.17951.10197779349789381116.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200426194946.112768-1-xypron.glpk@gmx.de>
The following commit has been merged into the efi/urgent branch of tip:
Commit-ID: 081d5150845ba3fa49151a2f55d3cc03b0987509
Gitweb: https://git.kernel.org/tip/081d5150845ba3fa49151a2f55d3cc03b0987509
Author: Heinrich Schuchardt <xypron.glpk@gmx.de>
AuthorDate: Sun, 26 Apr 2020 21:49:46 +02:00
Committer: Ard Biesheuvel <ardb@kernel.org>
CommitterDate: Thu, 30 Apr 2020 23:26:30 +02:00
efi/libstub: Avoid returning uninitialized data from setup_graphics()
Currently, setup_graphics() ignores the return value of efi_setup_gop(). As
AllocatePool() does not zero out memory, the screen information table will
contain uninitialized 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>
Link: https://lore.kernel.org/r/20200426194946.112768-1-xypron.glpk@gmx.de
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
drivers/firmware/efi/libstub/arm-stub.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c
index 99a5cde..48161b1 100644
--- a/drivers/firmware/efi/libstub/arm-stub.c
+++ b/drivers/firmware/efi/libstub/arm-stub.c
@@ -60,7 +60,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;
}
prev parent reply other threads:[~2020-05-22 18:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-26 19:49 [PATCH 1/1] efi/libstub: setup_graphics() do not return random data Heinrich Schuchardt
2020-04-27 6:52 ` Ard Biesheuvel
2020-05-22 18:30 ` tip-bot2 for Heinrich Schuchardt [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=159017221803.17951.10197779349789381116.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=ardb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
--cc=xypron.glpk@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.