From: "H.J. Lu" <hjl.tools@gmail.com>
To: binutils@sourceware.org
Cc: JBeulich@suse.com, wwwhhhyyy333@gmail.com
Subject: [PATCH v2] x86: Disallow instructions with length > 15 bytes
Date: Fri, 2 Feb 2024 03:33:10 -0800 [thread overview]
Message-ID: <20240202113310.145132-1-hjl.tools@gmail.com> (raw)
It is a hard error when an instruction length exceeds the limit of 15
bytes:
[hjl@gnu-cfl-3 tmp]$ cat x.s
.text
xacquire lock addq $0x11223344, %fs:(,%eax)
[hjl@gnu-cfl-3 tmp]$ gcc -c x.s
x.s: Assembler messages:
x.s:2: Warning: instruction length of 16 bytes exceeds the limit of 15
[hjl@gnu-cfl-3 tmp]$ objdump -dw x.o
x.o: file format elf64-x86-64
Disassembly of section .text:
0000000000000000 <.text>:
0: 64 67 f2 f0 48 81 04 05 00 00 00 00 44 33 22 xacquire lock (bad)
f: 11 .byte 0x11
[hjl@gnu-cfl-3 tmp]$
and
[hjl@gnu-cfl-3 tmp]$ cat z.s
addq $0xe0, %fs:0, %rdx
[hjl@gnu-cfl-3 tmp]$ as -o z.o z.s
z.s: Assembler messages:
z.s:1: Warning: instruction length of 16 bytes exceeds the limit of 15
[hjl@gnu-cfl-3 tmp]$ objdump -dw z.o
z.o: file format elf64-x86-64
Disassembly of section .text:
0000000000000000 <.text>:
0: 64 62 f4 ec 18 81 04 25 00 00 00 00 e0 00 00 (bad)
...
[hjl@gnu-cfl-3 pr31323]$
Instructions with length > 15 bytes are always invalid. It is quite easy
to generate invalid instructions with AVX now. We should issue an error
when instruction length exceeds the limit of 15 bytes.
PR gas/31323
* config/tc-i386.c (output_insn): Issue an error when instruction
length exceeds the limit of 15 bytes.
* testsuite/gas/i386/oversized16.l: Updated.
* testsuite/gas/i386/oversized64.l: Likewise.
* testsuite/gas/i386/x86-64-apx-inval.l: New file.
* testsuite/gas/i386/x86-64-apx-inval.s: Likewise.
---
gas/config/tc-i386.c | 4 +--
gas/testsuite/gas/i386/oversized16.l | 30 +++++++++++------------
gas/testsuite/gas/i386/oversized64.l | 30 +++++++++++------------
gas/testsuite/gas/i386/x86-64-apx-inval.l | 3 +++
gas/testsuite/gas/i386/x86-64-apx-inval.s | 4 +++
gas/testsuite/gas/i386/x86-64.exp | 1 +
6 files changed, 40 insertions(+), 32 deletions(-)
create mode 100644 gas/testsuite/gas/i386/x86-64-apx-inval.l
create mode 100644 gas/testsuite/gas/i386/x86-64-apx-inval.s
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 3e1811a092d..8f3a1b6f686 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -11780,8 +11780,8 @@ output_insn (const struct last_insn *last_insn)
{
j = encoding_length (insn_start_frag, insn_start_off, frag_more (0));
if (j > 15)
- as_warn (_("instruction length of %u bytes exceeds the limit of 15"),
- j);
+ as_bad (_("instruction length of %u bytes exceeds the limit of 15"),
+ j);
else if (fragP)
{
/* NB: Don't add prefix with GOTPC relocation since
diff --git a/gas/testsuite/gas/i386/oversized16.l b/gas/testsuite/gas/i386/oversized16.l
index 3bf7e1d8095..e0fc7619bdc 100644
--- a/gas/testsuite/gas/i386/oversized16.l
+++ b/gas/testsuite/gas/i386/oversized16.l
@@ -1,9 +1,9 @@
.*: Assembler messages:
-.*:6: Warning: instruction length.*
-.*:7: Warning: instruction length.*
-.*:8: Warning: instruction length.*
-.*:10: Warning: instruction length.*
-.*:11: Warning: instruction length.*
+.*:6: Error: instruction length.*
+.*:7: Error: instruction length.*
+.*:8: Error: instruction length.*
+.*:10: Error: instruction length.*
+.*:11: Error: instruction length.*
GAS LISTING .*
@@ -12,29 +12,29 @@ GAS LISTING .*
[ ]*3[ ]+\.code16
[ ]*4[ ]+
[ ]*5[ ]+long16:
-[ ]*6[ ]+0000 26678FEA[ ]+lwpins eax, es:\[eax\*8\], 0x11223344
-\*\*\*\* Warning: instruction length of 16 bytes exceeds the limit of 15
+[ ]*6[ ]+\?\?\?\? 26678FEA[ ]+lwpins eax, es:\[eax\*8\], 0x11223344
+\*\*\*\* Error: instruction length of 16 bytes exceeds the limit of 15
[ ]*6[ ]+781204C5[ ]*
[ ]*6[ ]+00000000[ ]*
[ ]*6[ ]+44332211[ ]*
-[ ]*7[ ]+0010 26678FEA[ ]+lwpval eax, es:\[eax\*4\], 0x11223344
-\*\*\*\* Warning: instruction length of 16 bytes exceeds the limit of 15
+[ ]*7[ ]+\?\?\?\? 26678FEA[ ]+lwpval eax, es:\[eax\*4\], 0x11223344
+\*\*\*\* Error: instruction length of 16 bytes exceeds the limit of 15
[ ]*7[ ]+78120C85[ ]*
[ ]*7[ ]+00000000[ ]*
[ ]*7[ ]+44332211[ ]*
-[ ]*8[ ]+0020 26678FEA[ ]+bextr eax, es:\[eax\*2\], 0x11223344
-\*\*\*\* Warning: instruction length of 16 bytes exceeds the limit of 15
+[ ]*8[ ]+\?\?\?\? 26678FEA[ ]+bextr eax, es:\[eax\*2\], 0x11223344
+\*\*\*\* Error: instruction length of 16 bytes exceeds the limit of 15
[ ]*8[ ]+78100445[ ]*
[ ]*8[ ]+00000000[ ]*
[ ]*8[ ]+44332211[ ]*
[ ]*9[ ]+
-[ ]*10[ ]+0030 266766F2[ ]+xacquire lock add dword ptr es:\[eax\*2\], 0x11223344
-\*\*\*\* Warning: instruction length of 16 bytes exceeds the limit of 15
+[ ]*10[ ]+\?\?\?\? 266766F2[ ]+xacquire lock add dword ptr es:\[eax\*2\], 0x11223344
+\*\*\*\* Error: instruction length of 16 bytes exceeds the limit of 15
[ ]*10[ ]+F0810445[ ]*
[ ]*10[ ]+00000000[ ]*
[ ]*10[ ]+44332211[ ]*
-[ ]*11[ ]+0040 266766F3[ ]+xrelease lock sub dword ptr es:\[eax\*2\], 0x11223344
-\*\*\*\* Warning: instruction length of 16 bytes exceeds the limit of 15
+[ ]*11[ ]+\?\?\?\? 266766F3[ ]+xrelease lock sub dword ptr es:\[eax\*2\], 0x11223344
+\*\*\*\* Error: instruction length of 16 bytes exceeds the limit of 15
[ ]*11[ ]+F0812C45[ ]*
[ ]*11[ ]+00000000[ ]*
[ ]*11[ ]+44332211[ ]*
diff --git a/gas/testsuite/gas/i386/oversized64.l b/gas/testsuite/gas/i386/oversized64.l
index dc63fb5ae77..ac32c4d8139 100644
--- a/gas/testsuite/gas/i386/oversized64.l
+++ b/gas/testsuite/gas/i386/oversized64.l
@@ -1,9 +1,9 @@
.*: Assembler messages:
-.*:5: Warning: instruction length.*
-.*:6: Warning: instruction length.*
-.*:7: Warning: instruction length.*
-.*:9: Warning: instruction length.*
-.*:10: Warning: instruction length.*
+.*:5: Error: instruction length.*
+.*:6: Error: instruction length.*
+.*:7: Error: instruction length.*
+.*:9: Error: instruction length.*
+.*:10: Error: instruction length.*
GAS LISTING .*
@@ -11,29 +11,29 @@ GAS LISTING .*
[ ]*2[ ]+\.intel_syntax noprefix
[ ]*3[ ]+
[ ]*4[ ]+long64:
-[ ]*5[ ]+0000 64678FEA[ ]+lwpins rax, fs:\[eax\*8\], 0x11223344
-\*\*\*\* Warning: instruction length of 16 bytes exceeds the limit of 15
+[ ]*5[ ]+\?\?\?\? 64678FEA[ ]+lwpins rax, fs:\[eax\*8\], 0x11223344
+\*\*\*\* Error: instruction length of 16 bytes exceeds the limit of 15
[ ]*5[ ]+F81204C5[ ]*
[ ]*5[ ]+00000000[ ]*
[ ]*5[ ]+44332211[ ]*
-[ ]*6[ ]+0010 64678FEA[ ]+lwpval eax, fs:\[eax\*4\], 0x11223344
-\*\*\*\* Warning: instruction length of 16 bytes exceeds the limit of 15
+[ ]*6[ ]+\?\?\?\? 64678FEA[ ]+lwpval eax, fs:\[eax\*4\], 0x11223344
+\*\*\*\* Error: instruction length of 16 bytes exceeds the limit of 15
[ ]*6[ ]+78120C85[ ]*
[ ]*6[ ]+00000000[ ]*
[ ]*6[ ]+44332211[ ]*
-[ ]*7[ ]+0020 64678FEA[ ]+bextr rax, fs:\[eax\*2\], 0x11223344
-\*\*\*\* Warning: instruction length of 16 bytes exceeds the limit of 15
+[ ]*7[ ]+\?\?\?\? 64678FEA[ ]+bextr rax, fs:\[eax\*2\], 0x11223344
+\*\*\*\* Error: instruction length of 16 bytes exceeds the limit of 15
[ ]*7[ ]+F8100445[ ]*
[ ]*7[ ]+00000000[ ]*
[ ]*7[ ]+44332211[ ]*
[ ]*8[ ]+
-[ ]*9[ ]+0030 6567F2F0[ ]+xacquire lock add qword ptr gs:\[eax\*8\], 0x11223344
-\*\*\*\* Warning: instruction length of 16 bytes exceeds the limit of 15
+[ ]*9[ ]+\?\?\?\? 6567F2F0[ ]+xacquire lock add qword ptr gs:\[eax\*8\], 0x11223344
+\*\*\*\* Error: instruction length of 16 bytes exceeds the limit of 15
[ ]*9[ ]+488104C5[ ]*
[ ]*9[ ]+00000000[ ]*
[ ]*9[ ]+44332211[ ]*
-[ ]*10[ ]+0040 6567F3F0[ ]+xrelease lock sub qword ptr gs:\[eax\*8\], 0x11223344
-\*\*\*\* Warning: instruction length of 16 bytes exceeds the limit of 15
+[ ]*10[ ]+\?\?\?\? 6567F3F0[ ]+xrelease lock sub qword ptr gs:\[eax\*8\], 0x11223344
+\*\*\*\* Error: instruction length of 16 bytes exceeds the limit of 15
[ ]*10[ ]+48812CC5[ ]*
[ ]*10[ ]+00000000[ ]*
[ ]*10[ ]+44332211[ ]*
diff --git a/gas/testsuite/gas/i386/x86-64-apx-inval.l b/gas/testsuite/gas/i386/x86-64-apx-inval.l
new file mode 100644
index 00000000000..6c1a346fcbf
--- /dev/null
+++ b/gas/testsuite/gas/i386/x86-64-apx-inval.l
@@ -0,0 +1,3 @@
+.*: Assembler messages:
+.*:3: Error: instruction length of 16 bytes exceeds the limit of 15
+.*:4: Error: instruction length of 16 bytes exceeds the limit of 15
diff --git a/gas/testsuite/gas/i386/x86-64-apx-inval.s b/gas/testsuite/gas/i386/x86-64-apx-inval.s
new file mode 100644
index 00000000000..bb57817bc8a
--- /dev/null
+++ b/gas/testsuite/gas/i386/x86-64-apx-inval.s
@@ -0,0 +1,4 @@
+# Check illegal 64bit APX_F instructions
+ .text
+ addq $0xe0, %fs:0, %rdx
+ xorq $0xe0, foo(%eax,%edx), %rdx
diff --git a/gas/testsuite/gas/i386/x86-64.exp b/gas/testsuite/gas/i386/x86-64.exp
index 6932ba97a4d..b77e8c10029 100644
--- a/gas/testsuite/gas/i386/x86-64.exp
+++ b/gas/testsuite/gas/i386/x86-64.exp
@@ -371,6 +371,7 @@ run_dump_test "x86-64-avx512f-rcigrne-intel"
run_dump_test "x86-64-avx512f-rcigrne"
run_dump_test "x86-64-avx512f-rcigru-intel"
run_dump_test "x86-64-avx512f-rcigru"
+run_list_test "x86-64-apx-inval"
run_list_test "x86-64-apx-egpr-inval"
run_dump_test "x86-64-apx-evex-promoted-bad"
run_list_test "x86-64-apx-egpr-promote-inval" "-al"
--
2.43.0
next reply other threads:[~2024-02-02 11:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-02 11:33 H.J. Lu [this message]
2024-02-02 11:41 ` Jan Beulich
2024-02-02 11:49 ` H.J. Lu
2024-02-05 7:41 ` Jan Beulich
2024-02-05 15:25 ` H.J. Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240202113310.145132-1-hjl.tools@gmail.com \
--to=hjl.tools@gmail.com \
--cc=JBeulich@suse.com \
--cc=binutils@sourceware.org \
--cc=wwwhhhyyy333@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).