Skip to content

Commit a714e12

Browse files
[AUTO-CHERRYPICK] hvloader: resolve CVEs in edk2's bundled openssl - branch main (#9080)
Co-authored-by: Archana Choudhary <36061892+arc9693@users.noreply.github.com>
1 parent 332adb9 commit a714e12

3 files changed

Lines changed: 15 additions & 6 deletions

File tree

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Summary: Signed HvLoader.efi for %{buildarch} systems
77
Name: hvloader-signed-%{buildarch}
88
Version: 1.0.1
9-
Release: 1%{?dist}
9+
Release: 2%{?dist}
1010
License: MIT
1111
Vendor: Microsoft Corporation
1212
Distribution: Mariner
@@ -69,6 +69,9 @@ popd
6969
/boot/efi/HvLoader.efi
7070

7171
%changelog
72+
* Fri May 10 2024 Archana Choudhary <archana1@microsoft.com> - 1.0.1-2
73+
- Update version for consistency with hvloader spec
74+
7275
* Thu Jan 04 2024 Cameron Baird <cameronbaird@microsoft.com> - 1.0.1-1
7376
- Original version for CBL-Mariner.
7477
- License verified
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Signatures": {
33
"hvloader-1.0.1.tar.gz": "4e0a15cfab98a89a0a93f747df876ea3ee5366c3ffbd158c28e296bf52c7dfba",
4-
"edk2-submodules-edk2-stable202211.tar.gz": "81a84900be864fab94935637278ac4db47b06bad1d00c1d1738c294c7caf23c7",
4+
"edk2-stable202302-submodules.tar.gz": "6e0c992145070d4f9e907a2baf9441b264927902537e888d20d2749055d52f20",
55
"target-x86.txt": "fcf4f427d3b80e67296be2a1d17ec124d65f673d4f6ea37d238f8d3fc1ddc4b8"
66
}
7-
}
7+
}

SPECS/hvloader/hvloader.spec

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
%define debug_package %{nil}
22
%define name_github HvLoader
3-
%define edk2_tag edk2-stable202211
3+
%define edk2_tag edk2-stable202302
44
Summary: HvLoader.efi is an EFI application for loading an external hypervisor loader.
55
Name: hvloader
66
Version: 1.0.1
7-
Release: 1%{?dist}
7+
Release: 2%{?dist}
88
License: MIT
99
Vendor: Microsoft Corporation
1010
Distribution: Mariner
1111
Group: Applications/System
1212
URL: https://github.com/microsoft/HvLoader
1313
Source0: https://github.com/microsoft/HvLoader/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
14-
Source1: https://github.com/tianocore/edk2/archive/refs/tags/%{edk2_tag}.tar.gz#/edk2-submodules-%{edk2_tag}.tar.gz
14+
# Instructions to generate edk2 submodules: https://github.com/tianocore/edk2/tree/edk2-stable202302?tab=readme-ov-file#submodules
15+
Source1: https://github.com/tianocore/edk2/archive/refs/tags/%{edk2_tag}.tar.gz#/%{edk2_tag}-submodules.tar.gz
1516
Source2: target-x86.txt
1617
BuildRequires: bc
1718
BuildRequires: gcc
@@ -57,6 +58,11 @@ cp ./Build/MdeModule/RELEASE_GCC5/X64/MdeModulePkg/Application/%{name_github}-%{
5758
/boot/efi/HvLoader.efi
5859

5960
%changelog
61+
* Wed May 08 2024 Archana Choudhary <archana1@microsoft.com> - 1.0.1-2
62+
- Update edk2_tag to edk2-stable202302
63+
- Publish edk2-stable202302-submodules source
64+
- Address openssl related CVEs (CVE-2023-0286, CVE-2023-0215, CVE-2022-4450, CVE-2022-4304)
65+
6066
* Tue May 02 2023 Cameron Baird <cameronbaird@microsoft.com> - 1.0.1-1
6167
- Add hvloader.spec
6268
- License verified

0 commit comments

Comments
 (0)