pool/grub2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 460048 from home:michael-chang:bsc:1026344

Browse Source 
- Temporary fix for openQA UEFI USB Boot failure (bsc#1026344)
  * 0001-Revert-efi-properly-terminate-filepath-with-NULL-in-.patch

OBS-URL: https://build.opensuse.org/request/show/460048
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=258
This commit is contained in:
Michael Chang 2017-02-23 15:35:40 +00:00 committed by Git OBS Bridge
parent 06839163a5
commit 6ef3acfa4c
3 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0001-Revert-efi-properly-terminate-filepath-with-NULL-in-.patch Normal file
View File

@ -0,0 +1,39 @@
From 28f83642deb777cce122c3629ddbd7b44a7f95b4 Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Thu, 23 Feb 2017 22:39:37 +0800
Subject: [PATCH] Revert "efi: properly terminate filepath with NULL in
chainloader"
This reverts commit ce95549cc54b5d6f494608a7c390dba3aab4fba7.
---
grub-core/loader/efi/chainloader.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
index adc8563..522a716 100644
--- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c
@@ -122,8 +122,6 @@ copy_file_path (grub_efi_file_path_device_path_t *fp,
if (*p == '/')
*p = '\\';
- /* File Path is NULL terminated */
- fp->path_name[size++] = '\0';
fp->header.length = size * sizeof (grub_efi_char16_t) + sizeof (*fp);
}
@@ -158,10 +156,8 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
d = GRUB_EFI_NEXT_DEVICE_PATH (d);
}
- /* File Path is NULL terminated. Allocate space for 2 extra characters */
- /* FIXME why we split path in two components? */
file_path = grub_malloc (size
- + ((grub_strlen (dir_start) + 2)
+ + ((grub_strlen (dir_start) + 1)
* GRUB_MAX_UTF16_PER_UTF8
* sizeof (grub_efi_char16_t))
+ sizeof (grub_efi_file_path_device_path_t) * 2);
--
2.6.6

6
grub2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 23 15:06:44 UTC 2017 - mchang@suse.com
- Temporary fix for openQA UEFI USB Boot failure (bsc#1026344)
* 0001-Revert-efi-properly-terminate-filepath-with-NULL-in-.patch
-------------------------------------------------------------------
Fri Feb 17 06:46:11 UTC 2017 - mchang@suse.com

2
grub2.spec
View File

@ -206,6 +206,7 @@ Patch77: grub2-s390x-08-workaround-part-to-disk.patch
Patch78: grub2-commands-introduce-read_file-subcommand.patch
Patch79: grub2-efi-chainload-harder.patch
Patch80: grub2-emu-4-all.patch
Patch81: 0001-Revert-efi-properly-terminate-filepath-with-NULL-in-.patch
# Btrfs snapshot booting related patches
Patch101: grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
Patch102: grub2-btrfs-02-export-subvolume-envvars.patch
@ -461,6 +462,7 @@ swap partition while in resuming
%patch78 -p1
%patch79 -p1
%patch80 -p1
%patch81 -p1
%patch101 -p1
%patch102 -p1
%patch103 -p1