toracat / rpms / kernel

Forked from rpms/kernel 4 years ago
Clone

Blame SOURCES/i386-audit-stop-scri-stack-frame.patch

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