|
 |
ef002e |
Note: this bug was taken from Commit-ID: 26c2d2b39128adba276d140eefa2745591b88536
|
|
|
ef002e |
and corrected for white space differences between the RHEL-7.1 3.10.0-229 upstream
|
|
|
ef002e |
kernel.
|
|
|
ef002e |
---
|
|
|
ef002e |
diff -uNrp a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
|
|
|
ef002e |
--- a/arch/x86/kernel/entry_32.S 2015-05-17 07:39:14.371778177 -0500
|
|
|
ef002e |
+++ b/arch/x86/kernel/entry_32.S 2015-05-17 07:36:13.654610869 -0500
|
|
|
ef002e |
@@ -457,15 +457,14 @@ sysenter_exit:
|
|
|
ef002e |
sysenter_audit:
|
|
|
ef002e |
testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%ebp)
|
|
|
ef002e |
jnz syscall_trace_entry
|
|
|
ef002e |
- addl $4,%esp
|
|
|
ef002e |
- CFI_ADJUST_CFA_OFFSET -4
|
|
|
ef002e |
- movl %esi,4(%esp) /* 5th arg: 4th syscall arg */
|
|
|
ef002e |
- movl %edx,(%esp) /* 4th arg: 3rd syscall arg */
|
|
|
ef002e |
- /* %ecx already in %ecx 3rd arg: 2nd syscall arg */
|
|
|
ef002e |
- movl %ebx,%edx /* 2nd arg: 1st syscall arg */
|
|
|
ef002e |
- /* %eax already in %eax 1st arg: syscall number */
|
|
|
ef002e |
+ /* movl PT_EAX(%esp), %eax already set, syscall number: 1st arg to audit */
|
|
|
ef002e |
+ movl PT_EBX(%esp), %edx /* ebx/a0: 2nd arg to audit */
|
|
|
ef002e |
+ /* movl PT_ECX(%esp), %ecx already set, a1: 3nd arg to audit */
|
|
|
ef002e |
+ pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
|
|
|
ef002e |
+ pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
|
|
|
ef002e |
call __audit_syscall_entry
|
|
|
ef002e |
- pushl_cfi %ebx
|
|
|
ef002e |
+ popl_cfi %ecx /* get that remapped edx off the stack */
|
|
|
ef002e |
+ popl_cfi %ecx /* get that remapped esi off the stack */
|
|
|
ef002e |
movl PT_EAX(%esp),%eax /* reload syscall number */
|
|
|
ef002e |
jmp sysenter_do_call
|
|
|
ef002e |
|
|
|
ef002e |
---
|