From 194fa0cc8ba8c0c2b8ca4e478ce80f17e25812d9 Mon Sep 17 00:00:00 2001
From: Oliver Steffen <osteffen@redhat.com>
Date: Thu, 7 Nov 2024 11:36:22 +0100
Subject: [PATCH 2/2] OvmfPkg/ArmVirtPkg: Add a Fallback RNG (RH only)

RH-Author: Oliver Steffen <osteffen@redhat.com>
RH-MergeRequest: 101: Add a Fallback RNG (RH only)
RH-Jira: RHEL-65735
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
RH-Commit: [2/2] 8bf84d42332ab54f6d1f768c8abe62485e7a12c9

Since the pixiefail CVE fix, the network stack requires a random number
generator.
In case there is no hardware random number generator available,
have the Platform Boot Manager install a pseudo RNG to ensure
the network can be used.

This patch adds the fallback RNG which was introduced in a
previous commit also to the ArmVirtPkg PlatformBootManagerLib.

Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
 OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c    | 6 ++++++
 .../PlatformBootManagerLibLight/PlatformBootManagerLib.inf  | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c
index 8e93f3cfed..8aa1e8e2df 100644
--- a/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c
+++ b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c
@@ -30,6 +30,7 @@
 #include <Guid/GlobalVariable.h>
 #include <Guid/RootBridgesConnectedEventGroup.h>
 #include <Guid/SerialPortLibVendor.h>
+#include "FallbackRng.h"
 
 #include "PlatformBm.h"
 
@@ -1029,6 +1030,7 @@ PlatformBootManagerBeforeConsole (
   //
   FilterAndProcess (&gEfiGraphicsOutputProtocolGuid, NULL, AddOutput);
 
+
   //
   // Add the hardcoded short-form USB keyboard device path to ConIn.
   //
@@ -1110,6 +1112,8 @@ PlatformBootManagerBeforeConsole (
   //
   FilterAndProcess (&gVirtioDeviceProtocolGuid, IsVirtioSerial, SetupVirtioSerial);
   FilterAndProcess (&gEfiPciIoProtocolGuid, IsVirtioPciSerial, SetupVirtioSerial);
+
+  FallbackRngCheckAndInstall ();
 }
 
 /**
@@ -1175,6 +1179,8 @@ PlatformBootManagerAfterConsole (
   RETURN_STATUS  Status;
   BOOLEAN        Uninstall;
 
+  FallbackRngPrintWarning ();
+
   //
   // Show the splash screen.
   //
diff --git a/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.inf
index 8e7cd5605f..4583c05ef4 100644
--- a/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.inf
+++ b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.inf
@@ -27,6 +27,8 @@
   PlatformBm.c
   PlatformBm.h
   QemuKernel.c
+  ../PlatformBootManagerLib/FallbackRng.h
+  ../PlatformBootManagerLib/FallbackRng.c
 
 [Packages]
   MdeModulePkg/MdeModulePkg.dec
@@ -53,6 +55,7 @@
   UefiBootServicesTableLib
   UefiLib
   UefiRuntimeServicesTableLib
+  RngLib
 
 [FixedPcd]
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate
@@ -70,6 +73,7 @@
   gEfiGlobalVariableGuid
   gRootBridgesConnectedEventGroupGuid
   gUefiShellFileGuid
+  gEfiRngAlgorithmRaw
 
 [Protocols]
   gEfiFirmwareVolume2ProtocolGuid
@@ -77,3 +81,4 @@
   gEfiMemoryAttributeProtocolGuid
   gEfiPciRootBridgeIoProtocolGuid
   gVirtioDeviceProtocolGuid
+  gEfiRngProtocolGuid
-- 
2.39.3