From c00bc8d4152562d715bc8ecd84a85af37e1a4087 Mon Sep 17 00:00:00 2001 From: Nicolas Frayer Date: Wed, 14 Jun 2023 19:32:04 +0200 Subject: [PATCH] efi/http: Change uint32_t to uintn_t for grub_efi_http_message_t Resolves #2178388 Signed-off-by: Nicolas Frayer --- ...uint32_t-to-uintn_t-for-grub_efi_htt.patch | 30 +++++++++++++++++++ grub.patches | 1 + grub2.spec | 6 +++- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0576-efi-http-change-uint32_t-to-uintn_t-for-grub_efi_htt.patch diff --git a/0576-efi-http-change-uint32_t-to-uintn_t-for-grub_efi_htt.patch b/0576-efi-http-change-uint32_t-to-uintn_t-for-grub_efi_htt.patch new file mode 100644 index 00000000..65ac476e --- /dev/null +++ b/0576-efi-http-change-uint32_t-to-uintn_t-for-grub_efi_htt.patch @@ -0,0 +1,30 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Hsiao +Date: Mon, 24 Apr 2023 13:39:05 +0800 +Subject: [PATCH] efi/http: change uint32_t to uintn_t for + grub_efi_http_message_t + +Modify UINT32 to UINTN in EFI_HTTP_MESSAGE to be UEFI 2.9 compliant. + +Signed-off-by: Matt Hsiao +Signed-off-by: Nicolas Frayer +--- + include/grub/efi/http.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/grub/efi/http.h b/include/grub/efi/http.h +index c5e9a89f5050..ad164ba1913d 100644 +--- a/include/grub/efi/http.h ++++ b/include/grub/efi/http.h +@@ -171,9 +171,9 @@ typedef struct { + grub_efi_http_request_data_t *request; + grub_efi_http_response_data_t *response; + } data; +- grub_efi_uint32_t header_count; ++ grub_efi_uintn_t header_count; + grub_efi_http_header_t *headers; +- grub_efi_uint32_t body_length; ++ grub_efi_uintn_t body_length; + void *body; + } grub_efi_http_message_t; + diff --git a/grub.patches b/grub.patches index 3eacbac0..ef2f8f04 100644 --- a/grub.patches +++ b/grub.patches @@ -573,3 +573,4 @@ Patch0572: 0572-font-Assign-null_font-to-glyphs-in-ascii_font_glyph.patch Patch0573: 0573-normal-charset-Fix-an-integer-overflow-in-grub_unico.patch Patch0574: 0574-Enable-TDX-measurement-to-RTMR-register.patch Patch0575: 0575-Enable-shared-processor-mode-in-vector-5.patch +Patch0576: 0576-efi-http-change-uint32_t-to-uintn_t-for-grub_efi_htt.patch diff --git a/grub2.spec b/grub2.spec index 64bb1246..c500332d 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 148%{?dist} +Release: 149%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -510,6 +510,10 @@ fi %endif %changelog +* Wed Jun 14 2023 Nicolas Frayer - 2.02-149 +- efi/http: change uint32_t to uintn_t for grub_efi_http_message_t +- Resolves: #2178388 + * Mon Feb 06 2023 Robbie Harwood - 2.02-148 - ppc64le: cas5, take 3 - Resolves: #2139508