Skip to contentSkip to conversation

x86,static_call: Fix __static_call_return0 for i386

RFC PATCH Applied Peter Zijlstra 2 participants 2 messages Mar 18, 2022 – Apr 5, 2022

Subsystems (2)
lore
Share & tools
lore

Peter Zijlstra

author maintainer
#0 lore raw

RFC PATCH 1/1 x86,static_call: Fix __static_call_return0 for i386

Paolo reported that the instruction sequence that is used to replace:

call __static_call_return0

namely:

    66 66 48 31 c0	data16 data16 xor %rax,%rax

decodes to something else on i386, namely:

    66 66 48		data16 dec %ax
    31 c0		xor    %eax,%eax

Which is a nonsensical sequence that happens to have the same outcome. *However* an important distinction is that it consists of 2 instructions which is a problem when it needs to be overwriten with a regular call instruction again.

As such, replace the instruction with something that is a 5 byte single instruction and decodes the same on both i386 and x86_64.

Fixes 3f2a8fc4b15d ("static_call/x86: Add __static_call_return0()")
---
 arch/x86/kernel/static_call.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
arch/x86/kernel/static_call.c +2 -3
@@ -12,10 +12,9 @@ enum insn_type {
 };
 
 /*
- * data16 data16 xorq %rax, %rax - a single 5 byte instruction that clears %rax
- * The REX.W cancels the effect of any data16.
+ * cs cs cs xorl %eax, %eax - a single 5 byte instruction that clears %[er]ax
  */
-static const u8 xor5rax[] = { 0x66, 0x66, 0x48, 0x31, 0xc0 };
+static const u8 xor5rax[] = { 0x2e, 0x2e, 0x2e, 0x31, 0xc0 };
 
 static const u8 retinsn[] = { RET_INSN_OPCODE, 0xcc, 0xcc, 0xcc, 0xcc };
 
merge bot Applied
#1 lore raw
The following commit has been merged into the locking/urgent branch of tip:

The following commit has been merged into the locking/urgent branch of tip:

Commit-ID:     1cd5f059d956e6f614ba6666ecdbcf95db05d5f5
Gitweb:        https://git.kernel.org/tip/1cd5f059d956e6f614ba6666ecdbcf95db05d5f5
Author:        Peter Zijlstra <[email protected]>
AuthorDate:    Fri, 18 Mar 2022 21:24:38 +01:00
Committer:     Peter Zijlstra <[email protected]>
CommitterDate: Tue, 05 Apr 2022 09:59:37 +02:00

x86,static_call: Fix __static_call_return0 for i386

Paolo reported that the instruction sequence that is used to replace:

call __static_call_return0

namely:

    66 66 48 31 c0	data16 data16 xor %rax,%rax

decodes to something else on i386, namely:

    66 66 48		data16 dec %ax
    31 c0		xor    %eax,%eax

Which is a nonsensical sequence that happens to have the same outcome. *However* an important distinction is that it consists of 2 instructions which is a problem when the thing needs to be overwriten with a regular call instruction again.

As such, replace the instruction with something that decodes the same on both i386 and x86_64.

Fixes 3f2a8fc4b15d ("static_call/x86: Add __static_call_return0()")
---
 arch/x86/kernel/static_call.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
arch/x86/kernel/static_call.c +2 -3
index 531fb4c..aa72cef 100644
@@ -12,10 +12,9 @@ enum insn_type {
 };
 
 /*
- * data16 data16 xorq %rax, %rax - a single 5 byte instruction that clears %rax
- * The REX.W cancels the effect of any data16.
+ * cs cs cs xorl %eax, %eax - a single 5 byte instruction that clears %[er]ax
  */
-static const u8 xor5rax[] = { 0x66, 0x66, 0x48, 0x31, 0xc0 };
+static const u8 xor5rax[] = { 0x2e, 0x2e, 0x2e, 0x31, 0xc0 };
 
 static const u8 retinsn[] = { RET_INSN_OPCODE, 0xcc, 0xcc, 0xcc, 0xcc };