Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1455732

[PATCH] x86/entry: Clarify the RF saving/restoring situation with SYSCALL/SYSRET

From Borislav Petkov <bp@alien8.de>
Newsgroups linux.kernel
Subject [PATCH] x86/entry: Clarify the RF saving/restoring situation with SYSCALL/SYSRET
Date 2016-08-03 12:30 +0200
Message-ID <s21B0-1hs-7@gated-at.bofh.it> (permalink)
Organization linux.* mail to news gateway

Show all headers | View raw


From: Borislav Petkov <bp@suse.de>

Clarify why exactly RF cannot be restored properly by SYSRET to avoid
confusion.

No functionality change.

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
---
 arch/x86/entry/entry_64.S | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 8956eae04c25..80ad6d0fe38b 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -288,11 +288,15 @@ return_from_SYSCALL_64:
 	jne	opportunistic_sysret_failed
 
 	/*
-	 * SYSRET can't restore RF.  SYSRET can restore TF, but unlike IRET,
-	 * restoring TF results in a trap from userspace immediately after
-	 * SYSRET.  This would cause an infinite loop whenever #DB happens
-	 * with register state that satisfies the opportunistic SYSRET
-	 * conditions.  For example, single-stepping this user code:
+	 * SYSCALL clears RF when it saves rFLAGS in R11 so SYSRET cannot
+	 * restore RF properly. If the slowpath sets it for whatever reason, we
+	 * need to restore it correctly.
+	 *
+	 * SYSRET can restore TF, but unlike IRET, restoring TF results in a
+	 * trap from userspace immediately after SYSRET.  This would cause an
+	 * infinite loop whenever #DB happens with register state that satisfies
+	 * the opportunistic SYSRET conditions.  For example, single-stepping
+	 * this user code:
 	 *
 	 *           movq	$stuck_here, %rcx
 	 *           pushfq
-- 
2.8.4

Back to linux.kernel | Previous | NextNext in thread | Find similar | Unroll thread


Thread

[PATCH] x86/entry: Clarify the RF saving/restoring situation with SYSCALL/SYSRET Borislav Petkov <bp@alien8.de> - 2016-08-03 12:30 +0200
  Re: [PATCH] x86/entry: Clarify the RF saving/restoring situation with SYSCALL/SYSRET Andy Lutomirski <luto@amacapital.net> - 2016-08-03 18:50 +0200
    Re: [PATCH] x86/entry: Clarify the RF saving/restoring situation  with SYSCALL/SYSRET Borislav Petkov <bp@alien8.de> - 2016-08-03 19:20 +0200
      Re: [PATCH] x86/entry: Clarify the RF saving/restoring situation with SYSCALL/SYSRET Andy Lutomirski <luto@amacapital.net> - 2016-08-03 19:30 +0200
        Re: [PATCH] x86/entry: Clarify the RF saving/restoring situation  with SYSCALL/SYSRET Borislav Petkov <bp@alien8.de> - 2016-08-03 20:10 +0200
      [tip:x86/urgent] x86/entry: Clarify the RF saving/restoring  situation with SYSCALL/SYSRET tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-08-10 22:50 +0200

csiph-web