Merge ~paelzer/ubuntu/+source/qemu:lp-1922010-s390x-go-HIRSUTE into ubuntu/+source/qemu:ubuntu/hirsute-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4514/+packages

[Paride Legovini (paride)]

Clean, formally correct and well split change. I didn't verify the case described in LP: #1922010 (not straightforward), but the version in the PPA appears to work fine in a simple use case and there's nothing calling attention in the build logs.

review: Approve

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/qemu
 * [new tag] upload/1%5.2+dfsg-9ubuntu2 -> upload/1%5.2+dfsg-9ubuntu2

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading qemu_5.2+dfsg-9ubuntu2.dsc: done.
  Uploading qemu_5.2+dfsg-9ubuntu2.debian.tar.xz: done.
  Uploading qemu_5.2+dfsg-9ubuntu2_source.buildinfo: done.
  Uploading qemu_5.2+dfsg-9ubuntu2_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 78a9423..62871a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qemu (1:5.2+dfsg-9ubuntu2) hirsute; urgency=medium
+
+  * d/p/u/lp-1922010-linux-user-s390x-Use-the-guest-pointer-for-the-sigre.patch:
+    fix go in qemu-s390x-static (LP: #1922010)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 31 Mar 2021 10:01:40 +0200
+
 qemu (1:5.2+dfsg-9ubuntu1) hirsute; urgency=medium
 
   * Merge with Debian unstable; Remaining changes:
diff --git a/debian/patches/series b/debian/patches/series
index b1e31c6..46548ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -40,3 +40,4 @@ ubuntu/pre-bionic-256k-ipxe-efi-roms.patch
 ubuntu/lp-1907789-build-no-pie-is-no-functional-liker-flag.patch
 ubuntu/lp-1916230-hw-s390x-fix-build-for-virtio-9p-ccw.patch
 ubuntu/lp-1916705-disas-Fix-build-with-glib2.0-2.67.3.patch
+ubuntu/lp-1922010-linux-user-s390x-Use-the-guest-pointer-for-the-sigre.patch
diff --git a/debian/patches/ubuntu/lp-1922010-linux-user-s390x-Use-the-guest-pointer-for-the-sigre.patch b/debian/patches/ubuntu/lp-1922010-linux-user-s390x-Use-the-guest-pointer-for-the-sigre.patch
new file mode 100644
index 0000000..078d943
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922010-linux-user-s390x-Use-the-guest-pointer-for-the-sigre.patch
@@ -0,0 +1,48 @@
+From 23fff7a17f47420797ac6480147941612152a9ad Mon Sep 17 00:00:00 2001
+From: Andreas Krebbel <[e-mail]>
+Date: Wed, 24 Mar 2021 19:51:28 +0100
+Subject: [PATCH] linux-user/s390x: Use the guest pointer for the sigreturn
+ stub
+
+When setting up the pointer for the sigreturn stub in the return
+address register (r14) we currently use the host frame address instead
+of the guest frame address.
+
+Note: This only caused problems if Qemu has been built with
+--disable-pie (as it is in distros nowadays). Otherwise guest_base
+defaults to 0 hiding the actual problem.
+
+Signed-off-by: Andreas Krebbel <[e-mail]>
+Reviewed-by: Laurent Vivier <[e-mail]>
+Reviewed-by: Richard Henderson <[e-mail]>
+Message-Id: <[e-mail]>
+Signed-off-by: Laurent Vivier <[e-mail]>
+
+Origin: upstream, https://git.qemu.org/?p=qemu.git;a=commit;h=23fff7a17f47420797ac6480147941612152a9ad
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1922010
+Last-Update: 2021-03-31
+
+---
+ linux-user/s390x/signal.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c
+index ecfa2a14a9..7107c5fb53 100644
+--- a/linux-user/s390x/signal.c
++++ b/linux-user/s390x/signal.c
+@@ -211,9 +211,10 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
+     /* Set up to return from userspace.  If provided, use a stub
+        already in userspace.  */
+     if (ka->sa_flags & TARGET_SA_RESTORER) {
+-        env->regs[14] = (unsigned long) ka->sa_restorer | PSW_ADDR_AMODE;
++        env->regs[14] = ka->sa_restorer | PSW_ADDR_AMODE;
+     } else {
+-        env->regs[14] = (unsigned long) frame->retcode | PSW_ADDR_AMODE;
++        env->regs[14] = (frame_addr + offsetof(typeof(*frame), retcode))
++                        | PSW_ADDR_AMODE;
+         __put_user(S390_SYSCALL_OPCODE | TARGET_NR_rt_sigreturn,
+                    (uint16_t *)(frame->retcode));
+     }
+-- 
+2.31.1
+