public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "PierreGondois" <pierre.gondois@arm.com>
To: devel@edk2.groups.io
Cc: Michael D Kinney <michael.d.kinney@intel.com>,
	Liming Gao <gaoliming@byosoft.com.cn>,
	Zhiguang Liu <zhiguang.liu@intel.com>,
	Jiewen Yao <jiewen.yao@intel.com>,
	Jian J Wang <jian.j.wang@intel.com>,
	Ard Biesheuvel <ardb+tianocore@kernel.org>,
	Sami Mujawar <sami.mujawar@arm.com>,
	Jose Marinho <Jose.Marinho@arm.com>,
	Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@arm.com>
Subject: [PATCH v1 7/8] SecurityPkg/RngDxe: Select safe default Rng algorithm
Date: Tue,  9 May 2023 09:40:41 +0200	[thread overview]
Message-ID: <20230509074042.1523428-8-pierre.gondois@arm.com> (raw)
In-Reply-To: <20230509074042.1523428-1-pierre.gondois@arm.com>

From: Pierre Gondois <pierre.gondois@arm.com>

The first element of mAvailableAlgoArray should be the default
algorithm to avoid going through a selection process at each
RngGetRNG() call.
Once all the available Rng algorithms have been probed, place
a safe Rng algorithm at the first position of mAvailableAlgoArray.

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 .../RngDxe/AArch64/AArch64Algo.c              | 48 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/SecurityPkg/RandomNumberGenerator/RngDxe/AArch64/AArch64Algo.c b/SecurityPkg/RandomNumberGenerator/RngDxe/AArch64/AArch64Algo.c
index a1ff7bd58fda..ed236b2e8141 100644
--- a/SecurityPkg/RandomNumberGenerator/RngDxe/AArch64/AArch64Algo.c
+++ b/SecurityPkg/RandomNumberGenerator/RngDxe/AArch64/AArch64Algo.c
@@ -17,6 +17,50 @@
 // Maximum number of Rng algorithms.
 #define RNG_AVAILABLE_ALGO_MAX  2
 
+/** mAvailableAlgoArray[0] should contain the default Rng algorithm.
+    The Rng algorithm at the first index might be unsafe.
+    If a safe algorithm is available, choose it as the default one.
+**/
+VOID
+EFIAPI
+RngFindDefaultAlgo (
+  VOID
+  )
+{
+  EFI_RNG_ALGORITHM  *CurAlgo;
+  EFI_RNG_ALGORITHM  TmpGuid;
+  UINTN              Index;
+
+  CurAlgo = &mAvailableAlgoArray[0];
+
+  if (IsZeroGuid (CurAlgo) ||
+      !CompareGuid (CurAlgo, &gEfiRngAlgorithmUnSafe))
+  {
+    // mAvailableAlgoArray[0] is a valid Rng algorithm.
+    return;
+  }
+
+  for (Index = 1; Index < mAvailableAlgoArrayCount; Index++) {
+    CurAlgo = &mAvailableAlgoArray[Index];
+    if (!IsZeroGuid (CurAlgo) ||
+        CompareGuid (CurAlgo, &gEfiRngAlgorithmUnSafe))
+    {
+      break;
+    }
+  }
+
+  if (Index == mAvailableAlgoArrayCount) {
+    // No valid Rng algorithm available.
+    return;
+  }
+
+  CopyMem (&TmpGuid, CurAlgo, sizeof (EFI_RNG_ALGORITHM));
+  CopyMem (CurAlgo, &mAvailableAlgoArray[0], sizeof (EFI_RNG_ALGORITHM));
+  CopyMem (&mAvailableAlgoArray[0], &TmpGuid, sizeof (EFI_RNG_ALGORITHM));
+
+  return;
+}
+
 /** Allocate and initialize mAvailableAlgoArray with the available
     Rng algorithms. Also update mAvailableAlgoArrayCount.
 
@@ -45,7 +89,7 @@ GetAvailableAlgorithms (
   if (!EFI_ERROR (Status)) {
     CopyMem (
       &mAvailableAlgoArray[mAvailableAlgoArrayCount],
-      RngGuid,
+      &RngGuid,
       sizeof (RngGuid)
       );
     mAvailableAlgoArrayCount++;
@@ -68,5 +112,7 @@ GetAvailableAlgorithms (
     mAvailableAlgoArrayCount++;
   }
 
+  RngFindDefaultAlgo ();
+
   return EFI_SUCCESS;
 }
-- 
2.25.1


  parent reply	other threads:[~2023-05-09  7:42 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-09  7:40 [PATCH v1 0/8] SecurityPkg/MdePkg: RngLib GUID PierreGondois
2023-05-09  7:40 ` [PATCH v1 1/8] MdePkg/ArmTrngLib: Remove ASSERTs in Null implementation PierreGondois
2023-06-29 10:23   ` Sami Mujawar
2023-06-29 20:34   ` [edk2-devel] " Kun Qin
2023-06-30 13:56     ` PierreGondois
2023-05-09  7:40 ` [PATCH v1 2/8] MdePkg/MdePkg.dec: Move PcdCpuRngSupportedAlgorithm to MdePkg PierreGondois
2023-06-29 10:23   ` Sami Mujawar
2023-06-29 20:36   ` [edk2-devel] " Kun Qin
2023-06-30 14:30     ` PierreGondois
2023-06-30 17:00       ` Kun Qin
2023-05-09  7:40 ` [PATCH v1 3/8] MdePkg/DxeRngLib: Request raw algorithm instead of default PierreGondois
2023-06-29 10:24   ` Sami Mujawar
2023-05-09  7:40 ` [PATCH v1 4/8] MdePkg/Rng: Add GUIDs to describe Rng algorithms PierreGondois
2023-05-09 13:45   ` Yao, Jiewen
2023-05-09 13:50     ` Samer El-Haj-Mahmoud
2023-05-09 13:55       ` Yao, Jiewen
2023-06-06 16:09       ` PierreGondois
2023-06-29 10:24   ` Sami Mujawar
2023-05-09  7:40 ` [PATCH v1 5/8] MdePkg/Rng: Add GetRngGuid() to RngLib PierreGondois
2023-06-29 10:27   ` Sami Mujawar
2023-05-09  7:40 ` [PATCH v1 6/8] SecurityPkg/RngDxe: Use GetRngGuid() when probing RngLib PierreGondois
2023-06-29 10:28   ` Sami Mujawar
2023-05-09  7:40 ` PierreGondois [this message]
2023-06-29 10:28   ` [PATCH v1 7/8] SecurityPkg/RngDxe: Select safe default Rng algorithm Sami Mujawar
2023-06-29 23:07     ` [edk2-devel] " Kun Qin
2023-06-30  7:22       ` Sami Mujawar
2023-05-09  7:40 ` [PATCH v1 8/8] SecurityPkg/RngDxe: Simplify Rng algorithm selection for Arm PierreGondois
2023-06-29 10:28   ` Sami Mujawar

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-list 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=20230509074042.1523428-8-pierre.gondois@arm.com \
    --to=devel@edk2.groups.io \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox