Merge ~fheimes/ubuntu/+source/qtwebkit-opensource-src:qtwebkit-lp1951470-hirsute into ubuntu/+source/qtwebkit-opensource-src:ubuntu/hirsute-devel

[Frank Heimes]

WebKit Javascript big endian/s390x segmentation-fault fix
 In CodeBlock.cpp the code preparing the operands of op_get_from_scope writes
 the property offset as pointer size (hence 64 bit) value:
 2141: instructions[i + 6].u.pointer = reinterpret_cast<void*>(op.operand);
 while the same slot is accessed later by the jitted code as 32 bit integer:
 macro getProperty(slow)
    loadisFromInstruction(6, t1)
 This fails on big endian targets since the integer access takes the higher
 part of the 64 bit value.
 Changing:
 macro getProperty(slow)
    loadisFromInstruction(6, t1)
 to
 macro getProperty(slow)
    loadpFromInstruction(6, t1)
 in llint/LowLevelInterpreter64.asm fixes the problem
 on big endian environments.
 Hence the changed code is very minimal.

 Test (verification that patch worked):
ubuntu@hwe0007:~$ arch
s390x
ubuntu@hwe0007:~$ lsb_release -cs
hirsute
ubuntu@hwe0007:~$ ls *.js *.html *.pdf
ls: cannot access '*.pdf': No such file or directory
 index.html min.js
ubuntu@hwe0007:~$ wkhtmltopdf --enable-local-file-access index.html test.pdf
Loading page (1/2)
Printing pages (2/2)
Done
ubuntu@hwe0007:~$ ls -l *.js *.html *.pdf
-rw-rw-r-- 1 ubuntu ubuntu 116 Nov 19 09:01 index.html
-rw-rw-r-- 1 ubuntu ubuntu 17 Nov 19 09:00 min.js
-rw-rw-r-- 1 ubuntu ubuntu 1339 Nov 25 11:09 test.pdf
ubuntu@hwe0007:~$

Unmerged commits

a79551e... by Frank Heimes on 2021-11-25

  * d/control for d/p/webkit-javascript-s390x-segmentation-fault-fix.patch
    after update-maintainer run

9716853... by Frank Heimes on 2021-11-25

  * d/changelog for d/p/webkit-javascript-s390x-segmentation-fault-fix.patch

ddbba80... by Frank Heimes on 2021-11-25

  * d/p/webkit-javascript-s390x-segmentation-fault-fix.patch:
    WebKit Javascript big endian/s390x segmentation-fault fix
    (LP: #1951470)

diff --git a/debian/changelog b/debian/changelog
index b881e92..1e25df4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qtwebkit-opensource-src (5.212.0~alpha4-12ubuntu0.21.04.1) hirsute; urgency=medium
+
+  * d/p/webkit-javascript-s390x-segmentation-fault-fix.patch:
+    WebKit Javascript big endian/s390x segmentation-fault fix
+    (LP: #1951470)
+
+ -- Frank Heimes <[e-mail]>  Thu, 25 Nov 2021 08:32:14 +0100
+
 qtwebkit-opensource-src (5.212.0~alpha4-12) experimental; urgency=medium
 
   * Add a patch from openSUSE to fix build with GLib ≥ 2.68.
diff --git a/debian/control b/debian/control
index d01d401..37b9ff1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: qtwebkit-opensource-src
 Priority: optional
-Maintainer: Debian Qt/KDE Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <[e-mail]>
 Uploaders: Timo Jyrinki <[e-mail]>,
            Lisandro Damián Nicanor Pérez Meyer <[e-mail]>,
            Dmitry Shachnev <[e-mail]>,
diff --git a/debian/patches/series b/debian/patches/series
index a369709..312acc9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ bison_3.7.diff
 no_pdf_image_plugin.diff
 python_3.9.diff
 glib_2.68.diff
+webkit-javascript-s390x-segmentation-fault-fix.patch
diff --git a/debian/patches/webkit-javascript-s390x-segmentation-fault-fix.patch b/debian/patches/webkit-javascript-s390x-segmentation-fault-fix.patch
new file mode 100644
index 0000000..bd6dcef
--- /dev/null
+++ b/debian/patches/webkit-javascript-s390x-segmentation-fault-fix.patch
@@ -0,0 +1,38 @@
+Description: WebKit Javascript big endian/s390x segmentation-fault fix
+ In CodeBlock.cpp the code preparing the operands of op_get_from_scope writes
+ the property offset as pointer size (hence 64 bit) value:
+ 2141: instructions[i + 6].u.pointer = reinterpret_cast<void*>(op.operand);
+ while the same slot is accessed later by the jitted code as 32 bit integer:
+ macro getProperty(slow)
+    loadisFromInstruction(6, t1)
+ This fails on big endian targets since the integer access takes the higher
+ part of the 64 bit value.
+ Changing:
+ macro getProperty(slow)
+    loadisFromInstruction(6, t1)
+ to
+ macro getProperty(slow)
+    loadpFromInstruction(6, t1)
+ in llint/LowLevelInterpreter64.asm fixes the problem
+ on big endian environments.
+
+Author: Andreas Krebbel <[e-mail]>
+Origin: vendor, https://launchpadlibrarian.net/569624765/webkit-IBMZ-fix.patch
+Bug-IBM: IBM Bugzilla 195436
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1951470
+Forwarded: not-needed
+Reviewed-by: Frank Heimes <[e-mail]>
+Last-Update: 2021-11-25
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+@@ -2020,7 +2020,7 @@
+ end
+ 
+ macro getProperty(slow)
+-    loadisFromInstruction(6, t1)
++    loadpFromInstruction(6, t1)
+     loadPropertyAtVariableOffset(t1, t0, t2, slow)
+     valueProfile(t2, 7, t0)
+     loadisFromInstruction(1, t0)