Skip to content

[AutoPR- Security] Patch hvloader for CVE-2025-69421 [MEDIUM] #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
azurelinux-security wants to merge 1 commit into
base: main
Choose a base branch
from
+42 −1
Draft

[AutoPR- Security] Patch hvloader for CVE-2025-69421 [MEDIUM] #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions SPECS/hvloader/CVE-2025-69421.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From 7d5ae600b62cf9990707357442d0fee33e85d6d6 Mon Sep 17 00:00:00 2001
From: AllSpark <allspark@microsoft.com>
Date: Mon, 9 Feb 2026 11:05:00 +0000
Subject: [PATCH] PKCS12_item_decrypt_d2i(): Check oct argument for NULL

Backport of upstream fix to validate ASN1_OCTET_STRING argument before use.
Prevents NULL dereference when oct is NULL.

Inspired by upstream patch for PKCS12_item_decrypt_d2i_ex().

Signed-off-by: Azure Linux Security Servicing Account <azurelinux-security@microsoft.com>
Upstream-reference: AI Backport from existing Build 1045616 of https://github.com/openssl/openssl/commit/36ecb4960872a4ce04bf6f1e1f4e78d75ec0c0c7.patch
---
.../Library/OpensslLib/openssl/crypto/pkcs12/p12_decr.c | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/CryptoPkg/Library/OpensslLib/openssl/crypto/pkcs12/p12_decr.c b/CryptoPkg/Library/OpensslLib/openssl/crypto/pkcs12/p12_decr.c
index 3c860584..85835734 100644
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/pkcs12/p12_decr.c
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/pkcs12/p12_decr.c
@@ -88,6 +88,13 @@ void *PKCS12_item_decrypt_d2i(const X509_ALGOR *algor, const ASN1_ITEM *it,
void *ret;
int outlen;

+
+ /* Check oct for NULL to avoid dereferencing a NULL pointer */
+ if (oct == NULL) {
+ PKCS12err(PKCS12_F_PKCS12_ITEM_DECRYPT_D2I, ERR_R_PASSED_NULL_PARAMETER);
+ return NULL;
+ }
+
if (!PKCS12_pbe_crypt(algor, pass, passlen, oct->data, oct->length,
&out, &outlen, 0)) {
PKCS12err(PKCS12_F_PKCS12_ITEM_DECRYPT_D2I,
--
2.45.4

6 changes: 5 additions & 1 deletion SPECS/hvloader/hvloader.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Summary: HvLoader.efi is an EFI application for loading an external hypervisor loader.
Name: hvloader
Version: 1.0.1
Release: 17%{?dist}
Release: 18%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -40,6 +40,7 @@ Patch22: CVE-2025-2295.patch
Patch23: CVE-2025-68160.patch
Patch24: CVE-2025-69418.patch
Patch25: CVE-2026-22796.patch
Patch26: CVE-2025-69421.patch

BuildRequires: bc
BuildRequires: gcc
Expand Down Expand Up @@ -85,6 +86,9 @@ cp ./Build/MdeModule/RELEASE_GCC5/X64/MdeModulePkg/Application/%{name_github}-%{
/boot/efi/HvLoader.efi

%changelog
* Mon Feb 09 2026 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 1.0.1-18
- Patch for CVE-2025-69421

* Mon Feb 02 2026 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 1.0.1-17
- Patch for CVE-2026-22796, CVE-2025-68160, CVE-2025-69418

Expand Down
Loading