diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-04-24 20:19:38 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-04-24 21:14:20 +0200 |
| commit | 460292af30f08567833926f0ee8b49287ba9c9bc (patch) | |
| tree | 5897661f8c87fa01239f8ff666299b663f2c05ab /gnu/packages/patches | |
| parent | a0a553dcf12b3d6ad99237b75c3907bcb6ccaeeb (diff) | |
| download | guix-460292af30f08567833926f0ee8b49287ba9c9bc.tar guix-460292af30f08567833926f0ee8b49287ba9c9bc.tar.gz | |
gnu: qemu: Update to 2.12.0.
* gnu/packages/patches/qemu-CVE-2018-7550.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/virtualization.scm (qemu): Update to 2.12.0.
[source](patches): Remove.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/qemu-CVE-2018-7550.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/gnu/packages/patches/qemu-CVE-2018-7550.patch b/gnu/packages/patches/qemu-CVE-2018-7550.patch deleted file mode 100644 index 43f111e206..0000000000 --- a/gnu/packages/patches/qemu-CVE-2018-7550.patch +++ /dev/null @@ -1,66 +0,0 @@ -Fix CVE-2018-7550: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7550 - -Patch copied from upstream source repository: - -https://git.qemu.org/?p=qemu.git;a=patch;h=2a8fcd119eb7c6bb3837fc3669eb1b2dfb31daf8 - -From 2a8fcd119eb7c6bb3837fc3669eb1b2dfb31daf8 Mon Sep 17 00:00:00 2001 -From: Jack Schwartz <jack.schwartz@oracle.com> -Date: Thu, 21 Dec 2017 09:25:15 -0800 -Subject: [PATCH] multiboot: bss_end_addr can be zero - -The multiboot spec (https://www.gnu.org/software/grub/manual/multiboot/), -section 3.1.3, allows for bss_end_addr to be zero. - -A zero bss_end_addr signifies there is no .bss section. - -Suggested-by: Daniel Kiper <daniel.kiper@oracle.com> -Signed-off-by: Jack Schwartz <jack.schwartz@oracle.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> -Reviewed-by: Prasad J Pandit <pjp@fedoraproject.org> -Signed-off-by: Kevin Wolf <kwolf@redhat.com> ---- - hw/i386/multiboot.c | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c -index 46d9c68bf5..bb8d8e4629 100644 ---- a/hw/i386/multiboot.c -+++ b/hw/i386/multiboot.c -@@ -233,12 +233,6 @@ int load_multiboot(FWCfgState *fw_cfg, - mh_entry_addr = ldl_p(header+i+28); - - if (mh_load_end_addr) { -- if (mh_bss_end_addr < mh_load_addr) { -- fprintf(stderr, "invalid mh_bss_end_addr address\n"); -- exit(1); -- } -- mb_kernel_size = mh_bss_end_addr - mh_load_addr; -- - if (mh_load_end_addr < mh_load_addr) { - fprintf(stderr, "invalid mh_load_end_addr address\n"); - exit(1); -@@ -249,8 +243,16 @@ int load_multiboot(FWCfgState *fw_cfg, - fprintf(stderr, "invalid kernel_file_size\n"); - exit(1); - } -- mb_kernel_size = kernel_file_size - mb_kernel_text_offset; -- mb_load_size = mb_kernel_size; -+ mb_load_size = kernel_file_size - mb_kernel_text_offset; -+ } -+ if (mh_bss_end_addr) { -+ if (mh_bss_end_addr < (mh_load_addr + mb_load_size)) { -+ fprintf(stderr, "invalid mh_bss_end_addr address\n"); -+ exit(1); -+ } -+ mb_kernel_size = mh_bss_end_addr - mh_load_addr; -+ } else { -+ mb_kernel_size = mb_load_size; - } - - /* Valid if mh_flags sets MULTIBOOT_HEADER_HAS_VBE. --- -2.17.0 - |