From 2b76639968fbe70b4cf1b6f59a27f89be878eab132df829b06ce673453f978ec Mon Sep 17 00:00:00 2001 From: Andrei Borzenkov Date: Fri, 17 Mar 2017 06:58:56 +0000 Subject: [PATCH] Accepting request 480763 from home:michael-chang:bsc:1029187 - 0004-tpm-Rework-linux-command.patch : Fix out of bound memory copy (bsc#1029187) OBS-URL: https://build.opensuse.org/request/show/480763 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=265 --- 0004-tpm-Rework-linux-command.patch | 8 ++++---- grub2.changes | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/0004-tpm-Rework-linux-command.patch b/0004-tpm-Rework-linux-command.patch index d92c325..e36626e 100644 --- a/0004-tpm-Rework-linux-command.patch +++ b/0004-tpm-Rework-linux-command.patch @@ -10,10 +10,10 @@ before pulling out the individual blocks later on. grub-core/loader/i386/linux.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) -Index: grub-2.02~beta3/grub-core/loader/i386/linux.c +Index: grub-2.02~rc1/grub-core/loader/i386/linux.c =================================================================== ---- grub-2.02~beta3.orig/grub-core/loader/i386/linux.c -+++ grub-2.02~beta3/grub-core/loader/i386/linux.c +--- grub-2.02~rc1.orig/grub-core/loader/i386/linux.c ++++ grub-2.02~rc1/grub-core/loader/i386/linux.c @@ -680,12 +680,13 @@ grub_cmd_linux (grub_command_t cmd __att grub_file_t file = 0; struct linux_kernel_header lh; @@ -68,7 +68,7 @@ Index: grub-2.02~beta3/grub-core/loader/i386/linux.c - goto fail; - } + -+ grub_memcpy (&linux_params + sizeof (lh), kernel + kernel_offset, len); ++ grub_memcpy ((char *)&linux_params + sizeof (lh), kernel + kernel_offset, len); + kernel_offset += len; linux_params.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE; diff --git a/grub2.changes b/grub2.changes index 9b45ab9..9003d72 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 17 06:22:42 UTC 2017 - mchang@suse.com + +- 0004-tpm-Rework-linux-command.patch : Fix out of bound memory copy + (bsc#1029187) + ------------------------------------------------------------------- Thu Mar 16 16:32:54 UTC 2017 - arvidjaar@gmail.com