You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.5 KiB
42 lines
1.5 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: Peter Jones <pjones@redhat.com> |
|
Date: Tue, 30 May 2017 14:16:07 -0400 |
|
Subject: [PATCH] Fix up linux params usage... |
|
|
|
Related: rhbz#1310763 |
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com> |
|
--- |
|
grub-core/loader/i386/linux.c | 5 ++++- |
|
1 file changed, 4 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c |
|
index e3906eb658f..656c75fd7e8 100644 |
|
--- a/grub-core/loader/i386/linux.c |
|
+++ b/grub-core/loader/i386/linux.c |
|
@@ -680,6 +680,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), |
|
{ |
|
grub_file_t file = 0; |
|
struct linux_kernel_header lh; |
|
+ grub_uint8_t *linux_params_ptr; |
|
grub_uint8_t setup_sects; |
|
grub_size_t real_size, prot_size, prot_file_size, kernel_offset; |
|
grub_ssize_t len; |
|
@@ -811,6 +812,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), |
|
preferred_address)) |
|
goto fail; |
|
|
|
+ |
|
grub_memset (&linux_params, 0, sizeof (linux_params)); |
|
grub_memcpy (&linux_params.setup_sects, &lh.setup_sects, sizeof (lh) - 0x1F1); |
|
|
|
@@ -820,7 +822,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), |
|
|
|
len = sizeof (linux_params) - sizeof (lh); |
|
|
|
- grub_memcpy (&linux_params + sizeof (lh), kernel + kernel_offset, len); |
|
+ linux_params_ptr = (void *)&linux_params; |
|
+ grub_memcpy (linux_params_ptr + sizeof (lh), kernel + kernel_offset, len); |
|
kernel_offset += len; |
|
|
|
linux_params.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE;
|
|
|