Merge ~paelzer/ubuntu/+source/binutils:lp-1883880-x86-don-t-mistakenly-scale-non-8-bit-BIONIC into ubuntu/+source/binutils:ubuntu/bionic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Doko is unavailable atm, but on direct contact he gave it a quick look and called it to be ok (on a superficial check).

Furthermore the pre-checks LGTM with all fails being known overrides in Bionic:
https://bileto.ubuntu.com/excuses/4105/bionic.html

ubuntu-release:9:force-badtest dh-ada-library/6.12
ubuntu-release:18:force-badtest lintian/2.5.81ubuntu1
pitti:2:force-badtest rpmlint/1.9-6
ubuntu-sru:17:force-badtest snapcraft/2.43.1+18.04/amd64 snapcraft/2.43.1+18.04/i386
ubuntu-sru:20:force-badtest snapcraft/2.43.1+18.04/armhf snapcraft/2.43.1+18.04/arm64
ubuntu-release:90:force-badtest linux-hwe/all
ubuntu-release:91:force-badtest linux-hwe-edge/all

Uploading for SRU consideration

I'd still not mind a deeper review by doko once he is back, but it isn't blocking this.

review: Approve

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/binutils
 * [new tag] upload/2.30-21ubuntu1_18.04.4 -> upload/2.30-21ubuntu1_18.04.4

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading binutils_2.30-21ubuntu1~18.04.4.dsc: done.
  Uploading binutils_2.30-21ubuntu1~18.04.4.debian.tar.xz: done.
  Uploading binutils_2.30-21ubuntu1~18.04.4_source.buildinfo: done.
  Uploading binutils_2.30-21ubuntu1~18.04.4_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 60963f4..e1e4938 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+binutils (2.30-21ubuntu1~18.04.4) bionic; urgency=medium
+
+  * d/p/lp-1883880-x86-don-t-mistakenly-scale-non-8-bit-displacements.patch:
+    avoid scaling displacements that breaks e.g. some AVX512 code (LP: #1883880)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 18 Jun 2020 13:03:55 +0200
+
 binutils (2.30-21ubuntu1~18.04.3) bionic-security; urgency=medium
 
   * SECURITY UPDATE: DoS via a large attribute section
diff --git a/debian/patches/lp-1883880-x86-don-t-mistakenly-scale-non-8-bit-displacements.patch b/debian/patches/lp-1883880-x86-don-t-mistakenly-scale-non-8-bit-displacements.patch
new file mode 100644
index 0000000..afc4766
--- /dev/null
+++ b/debian/patches/lp-1883880-x86-don-t-mistakenly-scale-non-8-bit-displacements.patch
@@ -0,0 +1,131 @@
+From 2069ccaf8dc28ea699bd901fdd35d90613e4402a Mon Sep 17 00:00:00 2001
+From: Jan Beulich <[e-mail]>
+Date: Tue, 31 Jul 2018 11:04:34 +0200
+Subject: [PATCH] x86: don't mistakenly scale non-8-bit displacements
+
+PR gas/23465
+
+In commit b5014f7af2 I've removed (instead of replaced) a conditional,
+resulting in addressing forms not allowing 8-bit displacements to now
+get their displacements scaled under certain circumstances. Re-add the
+missing conditional.
+
+Backport-Note: context noise in the Changelog, otherwise applying as-is
+Origin: backport, https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=2069ccaf8dc28ea699bd901fdd35d90613e4402a
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1883880
+Last-Update: 2020-06-18
+
+---
+ gas/ChangeLog                             |  9 +++++++++
+ gas/config/tc-i386.c                      |  3 ++-
+ gas/testsuite/gas/i386/evex-no-scale-32.d | 13 +++++++++++++
+ gas/testsuite/gas/i386/evex-no-scale-64.d | 15 +++++++++++++++
+ gas/testsuite/gas/i386/evex-no-scale.s    | 19 +++++++++++++++++++
+ gas/testsuite/gas/i386/i386.exp           |  2 ++
+ 6 files changed, 60 insertions(+), 1 deletion(-)
+ create mode 100644 gas/testsuite/gas/i386/evex-no-scale-32.d
+ create mode 100644 gas/testsuite/gas/i386/evex-no-scale-64.d
+ create mode 100644 gas/testsuite/gas/i386/evex-no-scale.s
+
+--- a/gas/ChangeLog
++++ b/gas/ChangeLog
+@@ -1,3 +1,13 @@
++2018-07-31  Jan Beulich  <[e-mail]>
++
++	PR gas/23465
++	* config/tc-i386.c (output_disp): Restrict scaling.
++	* testsuite/gas/i386/evex-no-scale.s,
++	  testsuite/gas/i386/evex-no-scale-32.d
++	  testsuite/gas/i386/evex-no-scale-64.d: New.
++	* testsuite/gas/i386/i386.exp: Run new tests.
++	Note: SRU backport in Ubuntu 2.30-21ubuntu1~18.04.4
++
+ 2018-04-25  Tamar Christina  <[e-mail]>
+ 
+ 	Backported from master branch
+--- a/gas/config/tc-i386.c
++++ b/gas/config/tc-i386.c
+@@ -7414,7 +7414,8 @@ output_disp (fragS *insn_start_frag, off
+ 	      int size = disp_size (n);
+ 	      offsetT val = i.op[n].disps->X_add_number;
+ 
+-	      val = offset_in_range (val >> i.memshift, size);
++	      val = offset_in_range (val >> (size == 1 ? i.memshift : 0),
++				     size);
+ 	      p = frag_more (size);
+ 	      md_number_to_chars (p, val, size);
+ 	    }
+--- /dev/null
++++ b/gas/testsuite/gas/i386/evex-no-scale-32.d
+@@ -0,0 +1,13 @@
++#source: evex-no-scale.s
++#objdump: -dw
++#name: ix86 EVEX no disp scaling
++
++.*: +file format .*
++
++Disassembly of section .text:
++
++0+ <disp>:
++ +[a-f0-9]+:	62 f1 7c 48 28 04 05 40 00 00 00 	vmovaps 0x40\(,%eax,1\),%zmm0
++ +[a-f0-9]+:	62 f1 7c 48 28 04 25 40 00 00 00 	vmovaps 0x40\(,%eiz,1\),%zmm0
++ +[a-f0-9]+:	62 f1 7c 48 28 05 40 00 00 00 	vmovaps 0x40,%zmm0
++ +[a-f0-9]+:	67 62 f1 7c 48 28 06 40 00 	vmovaps 0x40,%zmm0
+--- /dev/null
++++ b/gas/testsuite/gas/i386/evex-no-scale-64.d
+@@ -0,0 +1,15 @@
++#source: evex-no-scale.s
++#objdump: -dw
++#name: x86-64 EVEX no disp scaling
++
++.*: +file format .*
++
++Disassembly of section .text:
++
++0+ <disp>:
++ +[a-f0-9]+:	62 f1 7c 48 28 05 00 fc ff ff 	vmovaps -0x400\(%rip\),%zmm0        # .*
++ +[a-f0-9]+:	62 f1 7c 48 28 04 05 40 00 00 00 	vmovaps 0x40\(,%rax,1\),%zmm0
++ +[a-f0-9]+:	62 f1 7c 48 28 04 25 40 00 00 00 	vmovaps 0x40,%zmm0
++ +[a-f0-9]+:	67 62 f1 7c 48 28 04 05 40 00 00 00 	vmovaps 0x40\(,%eax,1\),%zmm0
++ +[a-f0-9]+:	67 62 f1 7c 48 28 04 25 40 00 00 00 	addr32 vmovaps 0x40,%zmm0
++ +[a-f0-9]+:	62 f1 7c 48 28 04 25 40 00 00 00 	vmovaps 0x40,%zmm0
+--- /dev/null
++++ b/gas/testsuite/gas/i386/evex-no-scale.s
+@@ -0,0 +1,19 @@
++	.allow_index_reg
++	.section .probe, "", @progbits
++.Lprobe_64bit:
++	inc	%eax
++.equiv is_64bit, (. - .Lprobe_64bit) / 2
++
++	.text
++disp:
++.if is_64bit
++	vmovaps	-1024(%rip), %zmm0
++	vmovaps	64(,%rax), %zmm0
++	vmovaps	64(,%riz), %zmm0
++.endif
++	vmovaps	64(,%eax), %zmm0
++	vmovaps	64(,%eiz), %zmm0
++	vmovaps	64, %zmm0
++.if !is_64bit
++	addr16 vmovaps 64, %zmm0
++.endif
+--- a/gas/testsuite/gas/i386/i386.exp
++++ b/gas/testsuite/gas/i386/i386.exp
+@@ -216,6 +216,7 @@ if [expr ([istarget "i*86-*-*"] ||  [ist
+     run_dump_test "evex-lig512-intel"
+     run_dump_test "evex-wig1"
+     run_dump_test "evex-wig1-intel"
++    run_dump_test "evex-no-scale-32"
+     run_dump_test "sse2avx"
+     run_list_test "inval-avx" "-al"
+     run_list_test "inval-avx512f" "-al"
+@@ -690,6 +691,7 @@ if [expr ([istarget "i*86-*-*"] || [ista
+     run_dump_test "x86-64-evex-lig512-intel"
+     run_dump_test "x86-64-evex-wig1"
+     run_dump_test "x86-64-evex-wig1-intel"
++    run_dump_test "evex-no-scale-64"
+     run_dump_test "x86-64-sse2avx"
+     run_list_test "x86-64-inval-avx" "-al"
+     run_list_test "x86-64-inval-avx512f" "-al"
diff --git a/debian/patches/series b/debian/patches/series
index bc4283f..6b0ad25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -81,3 +81,4 @@ CVE-2019-14250.patch
 CVE-2019-14444.patch
 CVE-2019-17450.patch
 CVE-2019-17451.patch
+lp-1883880-x86-don-t-mistakenly-scale-non-8-bit-displacements.patch