Merge ~paelzer/ubuntu/+source/qemu:lp-1830243-secure-boot-toleration-xenial into ubuntu/+source/qemu:ubuntu/xenial-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/bug-1830243-secure-boot-toleration

Testign this needs a secure boot enabled s390x kernel which I haven't seen yet.
I asked on the bug who could verify this.

[Rafael David Tinoco (rafaeldtinoco)]

I would like to review this one, since these were already in qemu 4.0 merge. Will get back to this soon.

[Rafael David Tinoco (rafaeldtinoco)]

I don't have access to s390 yet (working on it) so I'll do a logical review only.

[Rafael David Tinoco (rafaeldtinoco)]

https://code.launchpad.net/~paelzer/ubuntu/+source/qemu/+git/qemu/+merge/369711/comments/966862

[Rafael David Tinoco (rafaeldtinoco)]

without the fix:

(c)inaddy@lqemuxenial:~$ virsh start --console kguesttest
Domain kguesttest started
Connected to domain kguesttest
Escape character is ^]
Using SCSI scheme.
                  ..
                    ! No EXEC entry !

with the fix:

(c)inaddy@lqemuxenial:~$ virsh start --console kguesttest
Domain kguesttest started
Connected to domain kguesttest
Escape character is ^]
.......
       [ 0.501871] Linux version 5.2.0-1-generic (buildd@bos02-s390x-020) (gcc version 8.3.0 (Ubuntu 8.3.0-13ubuntu1)) #2-Ubuntu SMP Tue May 28 15:17:17 UTC 2019 (Ubuntu 5.2.0-1.2-generic 5.2.0-rc2)
[ 0.501873] setup.289988: Linux is running under KVM in 64-bit mode
[ 0.501898] setup.b050d0: The maximum memory size is 4096MB

review: Approve

[Rafael David Tinoco (rafaeldtinoco)]

patch is upstream and straightforward, binary generation is good:

dpkg-deb: building package 'qemu' in '../qemu_2.5+dfsg-5ubuntu10.41_s390x.deb'.
dpkg-deb: building package 'qemu-system' in '../qemu-system_2.5+dfsg-5ubuntu10.41_s390x.deb'.
dpkg-deb: building package 'qemu-block-extra' in '../qemu-block-extra_2.5+dfsg-5ubuntu10.41_s390x.deb'.
dpkg-deb: building package 'qemu-system-common' in '../qemu-system-common_2.5+dfsg-5ubuntu10.41_s390x.deb'.
dpkg-deb: building package 'qemu-system-misc' in '../qemu-system-misc_2.5+dfsg-5ubuntu10.41_s390x.deb'.
dpkg-deb: building package 'qemu-system-arm' in '../qemu-system-arm_2.5+dfsg-5ubuntu10.41_s390x.deb'.
dpkg-deb: building package 'qemu-system-mips' in '../qemu-system-mips_2.5+dfsg-5ubuntu10.41_s390x.deb'.
dpkg-deb: building package 'qemu-system-sparc' in '../qemu-system-sparc_2.5+dfsg-5ubuntu10.41_s390x.deb'.
dpkg-deb: building package 'qemu-system-ppc' in '../qemu-system-ppc_2.5+dfsg-5ubuntu10.41_s390x.deb'.
dpkg-deb: building package 'qemu-utils' in '../qemu-utils_2.5+dfsg-5ubuntu10.41_s390x.deb'.
dpkg-deb: building package 'qemu-guest-agent' in '../qemu-guest-agent_2.5+dfsg-5ubuntu10.41_s390x.deb'.
dpkg-deb: building package 'qemu-kvm' in '../qemu-kvm_2.5+dfsg-5ubuntu10.41_s390x.deb'.
dpkg-deb: building package 'qemu-user' in '../qemu-user_2.5+dfsg-5ubuntu10.41_s390x.deb'.
dpkg-deb: building package 'qemu-user-binfmt' in '../qemu-user-binfmt_2.5+dfsg-5ubuntu10.41_s390x.deb'.
dpkg-deb: building package 'qemu-system-x86' in '../qemu-system-x86_2.5+dfsg-5ubuntu10.41_s390x.deb'.
dpkg-deb: building package 'qemu-user-static' in '../qemu-user-static_2.5+dfsg-5ubuntu10.41_s390x.deb'.
dpkg-deb: building package 'qemu-system-s390x' in '../qemu-system-s390x_2.5+dfsg-5ubuntu10.41_s390x.deb'.

all good o/

[Christian Ehrhardt  (paelzer)]

This is fix released nowadays, cleaning up old MP

diff --git a/debian/changelog b/debian/changelog
index 18e52d4..dd1ec03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qemu (1:2.5+dfsg-5ubuntu10.41) xenial; urgency=medium
+
+  * d/p/ubuntu/lp-1830243-s390-bios-Skip-bootmap-signature-entries.patch:
+    tolerate guests with secure boot loaders (LP: #1830243)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 04 Jul 2019 14:47:56 +0200
+
 qemu (1:2.5+dfsg-5ubuntu10.40) xenial; urgency=medium
 
   * Restore patches that caused regression
diff --git a/debian/patches/series b/debian/patches/series
index e531988..5006edb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -285,3 +285,4 @@ CVE-2018-20815.patch
 CVE-2019-9824.patch
 lp1829380.patch
 lp1828288/target-i386-Set-AMD-alias-bits-after-filtering-CPUID.patch
+ubuntu/lp-1830243-s390-bios-Skip-bootmap-signature-entries.patch
diff --git a/debian/patches/ubuntu/lp-1830243-s390-bios-Skip-bootmap-signature-entries.patch b/debian/patches/ubuntu/lp-1830243-s390-bios-Skip-bootmap-signature-entries.patch
new file mode 100644
index 0000000..180428e
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1830243-s390-bios-Skip-bootmap-signature-entries.patch
@@ -0,0 +1,92 @@
+From 2497b4a3c08426122d1a89b808c669a734469e5a Mon Sep 17 00:00:00 2001
+From: "Jason J. Herne" <[e-mail]>
+Date: Mon, 29 Apr 2019 09:09:41 -0400
+Subject: [PATCH] s390-bios: Skip bootmap signature entries
+
+Newer versions of zipl have the ability to write signature entries to the boot
+script for secure boot. We don't yet support secure boot, but we need to skip
+over signature entries while reading the boot script in order to maintain our
+ability to boot guest operating systems that have a secure bootloader.
+
+Signed-off-by: Jason J. Herne <[e-mail]>
+Reviewed-by: Farhan Ali <[e-mail]>
+Message-Id: <[e-mail]>
+Signed-off-by: Thomas Huth <[e-mail]>
+
+Origin: backport, https://git.qemu.org/?p=qemu.git;a=commit;h=2497b4a3
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1830243
+Last-Update: 2019-07-04
+
+---
+ pc-bios/s390-ccw/bootmap.c | 19 +++++++++++++++++--
+ pc-bios/s390-ccw/bootmap.h | 10 ++++++----
+ 2 files changed, 23 insertions(+), 6 deletions(-)
+
+diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
+index 7aef65ab67..d13b7cbd15 100644
+--- a/pc-bios/s390-ccw/bootmap.c
++++ b/pc-bios/s390-ccw/bootmap.c
+@@ -254,7 +254,14 @@ static void run_eckd_boot_script(block_number_t bmt_block_nr,
+     memset(sec, FREE_SPACE_FILLER, sizeof(sec));
+     read_block(block_nr, sec, "Cannot read Boot Map Script");
+ 
+-    for (i = 0; bms->entry[i].type == BOOT_SCRIPT_LOAD; i++) {
++    for (i = 0; bms->entry[i].type == BOOT_SCRIPT_LOAD ||
++                bms->entry[i].type == BOOT_SCRIPT_SIGNATURE; i++) {
++
++        /* We don't support secure boot yet, so we skip signature entries */
++        if (bms->entry[i].type == BOOT_SCRIPT_SIGNATURE) {
++            continue;
++        }
++
+         address = bms->entry[i].address.load_address;
+         block_nr = eckd_block_num(&(bms->entry[i].blkptr));
+ 
+@@ -489,7 +496,15 @@ static void zipl_run(ScsiBlockPtr *pte)
+ 
+     /* Load image(s) into RAM */
+     entry = (ComponentEntry *)(&header[1]);
+-    while (entry->component_type == ZIPL_COMP_ENTRY_LOAD) {
++    while (entry->component_type == ZIPL_COMP_ENTRY_LOAD ||
++           entry->component_type == ZIPL_COMP_ENTRY_SIGNATURE) {
++
++        /* We don't support secure boot yet, so we skip signature entries */
++        if (entry->component_type == ZIPL_COMP_ENTRY_SIGNATURE) {
++            entry++;
++            continue;
++        }
++
+         zipl_load_segment(entry);
+ 
+         entry++;
+diff --git a/pc-bios/s390-ccw/bootmap.h b/pc-bios/s390-ccw/bootmap.h
+index a085212077..94f53a5f1e 100644
+--- a/pc-bios/s390-ccw/bootmap.h
++++ b/pc-bios/s390-ccw/bootmap.h
+@@ -98,8 +98,9 @@ typedef struct ScsiMbr {
+ #define ZIPL_COMP_HEADER_IPL    0x00
+ #define ZIPL_COMP_HEADER_DUMP   0x01
+ 
+-#define ZIPL_COMP_ENTRY_LOAD    0x02
+-#define ZIPL_COMP_ENTRY_EXEC    0x01
++#define ZIPL_COMP_ENTRY_EXEC      0x01
++#define ZIPL_COMP_ENTRY_LOAD      0x02
++#define ZIPL_COMP_ENTRY_SIGNATURE 0x03
+ 
+ typedef struct XEckdMbr {
+     uint8_t magic[4];   /* == "xIPL"        */
+@@ -117,8 +118,9 @@ typedef struct BootMapScriptEntry {
+     BootMapPointer blkptr;
+     uint8_t pad[7];
+     uint8_t type;   /* == BOOT_SCRIPT_* */
+-#define BOOT_SCRIPT_EXEC 0x01
+-#define BOOT_SCRIPT_LOAD 0x02
++#define BOOT_SCRIPT_EXEC      0x01
++#define BOOT_SCRIPT_LOAD      0x02
++#define BOOT_SCRIPT_SIGNATURE 0x03
+     union {
+         uint64_t load_address;
+         uint64_t load_psw;
+-- 
+2.22.0
+