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;
From:   Hans de Goede <hdegoede@redhat.com>
To:     Ard Biesheuvel <ard.biesheuvel@linaro.org>,
        Thomas Gleixner <tglx@linutronix.de>
Cc:     Hans de Goede <hdegoede@redhat.com>,
        Dominik Brodowski <linux@dominikbrodowski.net>, x86@kernel.org,
        linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5.5 regression fix 1/2] efi/libstub/random: Initialize pointer variables to zero for mixed mode
Date:   Thu, 12 Dec 2019 11:31:57 +0100
Message-Id: <20191212103158.4958-2-hdegoede@redhat.com>
In-Reply-To: <20191212103158.4958-1-hdegoede@redhat.com>
References: <20191212103158.4958-1-hdegoede@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit 0d95981438c3 ("x86: efi/random: Invoke EFI_RNG_PROTOCOL to seed th=
e
UEFI RNG table"), causes the drivers/efi/libstub/random.c code to get use=
d
on x86 for the first time.

But this code was not written with EFI mixed mode in mind (running a 64
bit kernel on 32 bit EFI firmware), this causes the kernel to crash durin=
g
early boot when running in mixed mode.

The problem is that in mixed mode pointers are 64 bit, but when running o=
n
a 32 bit firmware, EFI calls which return a pointer value by reference on=
ly
fill the lower 32 bits of the passed pointer, leaving the upper 32 bits
uninitialized which leads to crashes.

This commit fixes this by initializing pointers which are passed by
reference to EFI calls to NULL before passing them, so that the upper 32
bits are initialized to 0.

Fixes: 0d95981438c3 ("x86: efi/random: Invoke EFI_RNG_PROTOCOL to seed th=
e UEFI RNG table")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/firmware/efi/libstub/random.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/firmware/efi/libstub/random.c b/drivers/firmware/efi=
/libstub/random.c
index 35edd7cfb6a1..97378cf96a2e 100644
--- a/drivers/firmware/efi/libstub/random.c
+++ b/drivers/firmware/efi/libstub/random.c
@@ -33,7 +33,7 @@ efi_status_t efi_get_random_bytes(efi_system_table_t *s=
ys_table_arg,
 {
 	efi_guid_t rng_proto =3D EFI_RNG_PROTOCOL_GUID;
 	efi_status_t status;
-	struct efi_rng_protocol *rng;
+	struct efi_rng_protocol *rng =3D NULL;
=20
 	status =3D efi_call_early(locate_protocol, &rng_proto, NULL,
 				(void **)&rng);
@@ -162,8 +162,8 @@ efi_status_t efi_random_get_seed(efi_system_table_t *=
sys_table_arg)
 	efi_guid_t rng_proto =3D EFI_RNG_PROTOCOL_GUID;
 	efi_guid_t rng_algo_raw =3D EFI_RNG_ALGORITHM_RAW;
 	efi_guid_t rng_table_guid =3D LINUX_EFI_RANDOM_SEED_TABLE_GUID;
-	struct efi_rng_protocol *rng;
-	struct linux_efi_random_seed *seed;
+	struct efi_rng_protocol *rng =3D NULL;
+	struct linux_efi_random_seed *seed =3D NULL;
 	efi_status_t status;
=20
 	status =3D efi_call_early(locate_protocol, &rng_proto, NULL,
--=20
2.23.0