Skip to content

Commit bc393da

Browse files
[AUTO-CHERRYPICK] [AutoPR- Security] Patch edk2 for CVE-2025-15467 [CRITICAL] - branch 3.0-dev (#15646)
Co-authored-by: Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> Co-authored-by: Kanishk Bansal <kanbansal@microsoft.com> Co-authored-by: jslobodzian <joslobo@microsoft.com> approving PR. Buddy build and expected tests passed.
1 parent 3efa245 commit bc393da

File tree

3 files changed

+61
-5
lines changed

3 files changed

+61
-5
lines changed

SPECS-SIGNED/edk2-hvloader-signed/edk2-hvloader-signed.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
Summary: Signed HvLoader.efi for %{buildarch} systems
1212
Name: edk2-hvloader-signed-%{buildarch}
1313
Version: %{GITDATE}git%{GITCOMMIT}
14-
Release: 12%{?dist}
14+
Release: 13%{?dist}
1515
License: MIT
1616
Vendor: Microsoft Corporation
1717
Distribution: Azure Linux
@@ -74,7 +74,10 @@ popd
7474
/boot/efi/HvLoader.efi
7575

7676
%changelog
77-
* Tue Jan 06 2026 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 20240524git3e722403cd16-12
77+
* Sun Feb 01 2026 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 20240524git3e722403cd16-13
78+
- Bump release for consistency with edk2 spec.
79+
80+
* Fri Jan 30 2026 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 20240524git3e722403cd16-12
7881
- Bump release for consistency with edk2 spec.
7982

8083
* Thu Dec 18 2025 Jyoti kanase <v-jykanase@microsoft.com> - 20240524git3e722403cd16-11

SPECS/edk2/CVE-2025-15467.patch

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
From 636fb597f7690441e1003b46e206f0ea96b4dc02 Mon Sep 17 00:00:00 2001
2+
From: Igor Ustinov <igus68@gmail.com>
3+
Date: Mon, 12 Jan 2026 12:13:35 +0100
4+
Subject: [PATCH] Correct handling of AEAD-encrypted CMS with inadmissibly long
5+
IV
6+
MIME-Version: 1.0
7+
Content-Type: text/plain; charset=UTF-8
8+
Content-Transfer-Encoding: 8bit
9+
10+
Fixes CVE-2025-15467
11+
12+
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
13+
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
14+
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
15+
Reviewed-by: Tomas Mraz <tomas@openssl.org>
16+
MergeDate: Mon Jan 26 19:31:45 2026
17+
(cherry picked from commit 0ddd6b6bcbdedbe2c8304af05771f8ab11939112)
18+
Signed-off-by: rpm-build <rpm-build>
19+
Upstream-reference: https://github.com/openssl/openssl/commit/6ced0fe6b10faa560e410e3ee8d6c82f06c65ea3.patch
20+
---
21+
CryptoPkg/Library/OpensslLib/openssl/crypto/evp/evp_lib.c | 5 ++---
22+
1 file changed, 2 insertions(+), 3 deletions(-)
23+
24+
diff --git a/CryptoPkg/Library/OpensslLib/openssl/crypto/evp/evp_lib.c b/CryptoPkg/Library/OpensslLib/openssl/crypto/evp/evp_lib.c
25+
index d88066d..3eb80b8 100644
26+
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/evp/evp_lib.c
27+
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/evp/evp_lib.c
28+
@@ -249,10 +249,9 @@ int evp_cipher_get_asn1_aead_params(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
29+
if (type == NULL || asn1_params == NULL)
30+
return 0;
31+
32+
- i = ossl_asn1_type_get_octetstring_int(type, &tl, NULL, EVP_MAX_IV_LENGTH);
33+
- if (i <= 0)
34+
+ i = ossl_asn1_type_get_octetstring_int(type, &tl, iv, EVP_MAX_IV_LENGTH);
35+
+ if (i <= 0 || i > EVP_MAX_IV_LENGTH)
36+
return -1;
37+
- ossl_asn1_type_get_octetstring_int(type, &tl, iv, i);
38+
39+
memcpy(asn1_params->iv, iv, i);
40+
asn1_params->iv_len = i;
41+
--
42+
2.45.4
43+

SPECS/edk2/edk2.spec

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ExclusiveArch: x86_64
5555

5656
Name: edk2
5757
Version: %{GITDATE}git%{GITCOMMIT}
58-
Release: 12%{?dist}
58+
Release: 13%{?dist}
5959
Summary: UEFI firmware for 64-bit virtual machines
6060
License: Apache-2.0 AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-2-Clause-Patent AND BSD-3-Clause AND BSD-4-Clause AND ISC AND MIT AND LicenseRef-Fedora-Public-Domain
6161
URL: https://www.tianocore.org
@@ -141,7 +141,8 @@ Patch1004: CVE-2024-2511.patch
141141
Patch1005: CVE-2024-4603.patch
142142
Patch1006: CVE-2025-3770.patch
143143
Patch1007: CVE-2025-9230.patch
144-
Patch1008: CVE-2025-2295.patch
144+
Patch1008: CVE-2025-15467.patch
145+
Patch1009: CVE-2025-2295.patch
145146

146147
# python3-devel and libuuid-devel are required for building tools.
147148
# python3-devel is also needed for varstore template generation and
@@ -803,9 +804,12 @@ done
803804
/boot/efi/HvLoader.efi
804805

805806
%changelog
806-
* Tue Jan 06 2026 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 20240524git3e722403cd16-12
807+
* Sun Feb 01 2026 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 20240524git3e722403cd16-13
807808
- Patch for CVE-2025-2295
808809

810+
* Fri Jan 30 2026 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 20240524git3e722403cd16-12
811+
- Patch for CVE-2025-15467
812+
809813
* Thu Dec 18 2025 Jyoti kanase <v-jykanase@microsoft.com> - 20240524git3e722403cd16-11
810814
- Patch for CVE-2025-2296
811815

@@ -815,6 +819,12 @@ done
815819
* Mon Aug 11 2025 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 20240524git3e722403cd16-9
816820
- Patch for CVE-2025-3770
817821

822+
* Fri Oct 03 2025 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 20240524git3e722403cd16-10
823+
- Patch for CVE-2025-9230
824+
825+
* Mon Aug 11 2025 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 20240524git3e722403cd16-9
826+
- Patch for CVE-2025-3770
827+
818828
* Thu Apr 24 2025 Jyoti Kanase <v-jykanase@microsoft.com> - 20240524git3e722403cd16-8
819829
- Fix CVE-2024-38796
820830

0 commit comments

Comments
 (0)