Skip to contentSkip to conversation

x86-64: fix another kernel data leak to 32-bit processes

PATCH New Jan Beulich 1 participant 1 message Oct 19, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86-64: fix another kernel data leak to 32-bit processes

Unfortunately I didn't realize that the other instances of branches to int_ret_from_sys_call also need fixing when preparing the previous similar patch. The issue fixed here was in fact introduced by an earlier patch of mine (295286a89107c353b9677bc604361c537fd6a1c0, i.e. in 2.6.28, but through stable now also present in 2.6.27), making kernel stack contents potentially visible through R8...R11 when an this or earlier syscall got interrupted prior to the handler being able to decrement the stack pointer (such that the space normally used by those registers within pt_regs would get overwritten by the interrupt handler stub).

While touching the code, I also swapped the branch pairs so that the static branch prediction logic would consider the syscall-number-in- range case the taken path.

---
 arch/x86/ia32/ia32entry.S |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
arch/x86/ia32/ia32entry.S +9 -9
@@ -249,9 +249,9 @@ sysenter_tracesys:
 	call	syscall_trace_enter
 	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
 	RESTORE_REST
-	cmpl	$(IA32_NR_syscalls-1),%eax
-	ja	int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
-	jmp	sysenter_do_call
+	cmpl	$IA32_NR_syscalls,%eax
+	jb	sysenter_do_call
+	jmp	ia32_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
 	CFI_ENDPROC
 ENDPROC(ia32_sysenter_target)
 
@@ -368,9 +368,9 @@ cstar_tracesys:
 	LOAD_ARGS32 ARGOFFSET, 1  /* reload args from stack in case ptrace changed it */
 	RESTORE_REST
 	xchgl %ebp,%r9d
-	cmpl $(IA32_NR_syscalls-1),%eax
-	ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
-	jmp cstar_do_call
+	cmpl $IA32_NR_syscalls,%eax
+	jb cstar_do_call
+	jmp ia32_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
 END(ia32_cstar_target)
 				
 ia32_badarg:
@@ -445,9 +445,9 @@ ia32_tracesys:			 
 	call syscall_trace_enter
 	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
 	RESTORE_REST
-	cmpl $(IA32_NR_syscalls-1),%eax
-	ja  int_ret_from_sys_call	/* ia32_tracesys has set RAX(%rsp) */
-	jmp ia32_do_call
+	cmpl $IA32_NR_syscalls,%eax
+	jb ia32_do_call
+	jmp ia32_ret_from_sys_call	/* ia32_tracesys has set RAX(%rsp) */
 END(ia32_syscall)
 
 ia32_badsys: