Merge ~paelzer/ubuntu/+source/seabios:fix-1866870-FOCAL into ubuntu/+source/seabios:ubuntu/focal-devel

[Christian Ehrhardt ]

4286cbb... by Christian Ehrhardt  on 2020-03-19

update-maintainer

Signed-off-by: Christian Ehrhardt <email address hidden>

[Andreas Hasenack (ahasenack)]

Preemptive +1 on the packaging side. Thanks for sending it upstream. If they come up with a different fix, one that doesn't require changing the gcc flag, we can apply that later.

Maybe just add somewhere the link to https://wiki.ubuntu.com/ToolChain/CompilerFlags#A-fcf-protection, could be inthe patch, or in d/rules itself, or anywhere else you think it would be appropriate.

review: Approve

[Christian Ehrhardt  (paelzer)]

Upstream only complained about the commit message but nothing more happened.
I'll upload the fix to unbreak focal.

I pinged Debian on IRC.
For an easy pick-up I provided https://salsa.debian.org/qemu-team/seabios/-/merge_requests/3

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/seabios
 * [new tag] upload/1.13.0-1ubuntu1 -> upload/1.13.0-1ubuntu1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading seabios_1.13.0-1ubuntu1.dsc: done.
  Uploading seabios_1.13.0-1ubuntu1.debian.tar.xz: done.
  Uploading seabios_1.13.0-1ubuntu1_source.buildinfo: done.
  Uploading seabios_1.13.0-1ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 477e60f..ce1378b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+seabios (1.13.0-1ubuntu1) focal; urgency=medium
+
+  * d/p/lp-1866870-build-use-fcf-protection-none-when-available.patch
+    fix breakage on older chips due to fcf-protection (LP: #1866870)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 19 Mar 2020 13:10:10 +0100
+
 seabios (1.13.0-1) unstable; urgency=medium
 
   * new upstream release 1.13.0 (Closes: #931346)
diff --git a/debian/control b/debian/control
index d66b3ea..de9bfa9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: seabios
 Section: misc
 Priority: optional
-Maintainer: Debian QEMU Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian QEMU Team <[e-mail]>
 Uploaders: Aurelien Jarno <[e-mail]>,
 	Riku Voipio <[e-mail]>,
 	Michael Tokarev <[e-mail]>
diff --git a/debian/patches/lp-1866870-build-use-fcf-protection-none-when-available.patch b/debian/patches/lp-1866870-build-use-fcf-protection-none-when-available.patch
new file mode 100644
index 0000000..a70317c
--- /dev/null
+++ b/debian/patches/lp-1866870-build-use-fcf-protection-none-when-available.patch
@@ -0,0 +1,61 @@
+From 7bc5e4dff67636adb76c2b59a15a082a060ff68f Mon Sep 17 00:00:00 2001
+From: Christian Ehrhardt <[e-mail]>
+Date: Thu, 19 Mar 2020 12:25:24 +0100
+Subject: [PATCH] build: use -fcf-protection=none when available
+
+Some hardened gcc v9 compilers (such as the one in Ubuntu)
+default this option which for seabios leads to emulation errors
+when running in KVM (does not trigger in TCG) on older intel
+chips of the Penryn generation (~2006-2008).
+
+Symptom in KVM looks like:
+  KVM internal error. Suberror: 1
+  emulation failure
+  EAX=00000000 EBX=00000000 ECX=000086d4 EDX=00000000
+  ESI=00000000 EDI=00000000 EBP=000086d4 ESP=00006d7c
+  EIP=00007acf EFL=00000002 [-------] CPL=0 II=0 A20=1 SMM=0 HLT=0
+  ES =0000 00000000 ffffffff 00809300
+  CS =f000 000f0000 ffffffff 00809b00
+  SS =0000 00000000 ffffffff 00809300
+  DS =0000 00000000 ffffffff 00809300
+  FS =0000 00000000 ffffffff 00809300
+  GS =0000 00000000 ffffffff 00809300
+  LDT=0000 00000000 0000ffff 00008200
+  TR =0000 00000000 0000ffff 00008b00
+  GDT=     000f6200 00000037
+  IDT=     00000000 000003ff
+  CR0=00000010 CR2=00000000 CR3=00000000 CR4=00000000
+  DR0=0000000000000000 DR1=0000000000000000
+  DR2=0000000000000000 DR3=0000000000000000
+  DR6=00000000ffff0ff0 DR7=0000000000000400
+  EFER=0000000000000000
+  Code=b8 90 d9 00 00 66 e8 6b f7 ff ff 66 b8 0a 00 00
+       00 e9 61 f2 <f3> 0f 1e fb 66 57 66 56 66 53 66 53
+       66 89 c7 67 66 89 14 24 66 89 ce 66 e8 15 f8 ff ff 88
+
+URL: https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1866870
+Signed-off-by: Christian Ehrhardt <[e-mail]>
+
+Forwarded: yes (https://mail.coreboot.org/hyperkitty/list/[e-mail]/thread/IXAWMA2HWW75LSR3NBBYQKWT3TI5WVVP/)
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1866870
+Last-Update: 2020-03-19
+
+---
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile b/Makefile
+index 5f7d5370..9e8188e5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -69,6 +69,7 @@ COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
+ COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,)
+ COMMONCFLAGS += $(call cc-option,$(CC),-fstack-check=no,)
+ COMMONCFLAGS += $(call cc-option,$(CC),-Wno-address-of-packed-member,)
++COMMONCFLAGS += $(call cc-option,$(CC),-fcf-protection=none,)
+ COMMA := ,
+ 
+ CFLAGS32FLAT := $(COMMONCFLAGS) -DMODE16=0 -DMODESEGMENT=0
+-- 
+2.25.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5a7c60b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+lp-1866870-build-use-fcf-protection-none-when-available.patch