audit: x86: drop arch from __audit_syscall_entry() interface

Since the arch is found locally in __audit_syscall_entry(), there is no need to
pass it in as a parameter.  Delete it from the parameter list.

x86* was the only arch to call __audit_syscall_entry() directly and did so from
assembly code.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-audit@redhat.com
Signed-off-by: Eric Paris <eparis@redhat.com>

---

As this patch relies on changes in the audit tree, I think it
appropriate to send it through my tree rather than the x86 tree.

3 files changed, 16 insertions, 18 deletions

diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index 4299eb05023c..f5bdd2881815 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -186,12 +186,12 @@ sysexit_from_sys_call:
 
 #ifdef CONFIG_AUDITSYSCALL
         .macro auditsys_entry_common
-        movl %esi,%r9d                  /* 6th arg: 4th syscall arg */
-        movl %edx,%r8d                  /* 5th arg: 3rd syscall arg */
-        /* (already in %ecx)               4th arg: 2nd syscall arg */
-        movl %ebx,%edx                  /* 3rd arg: 1st syscall arg */
-        movl %eax,%esi                  /* 2nd arg: syscall number */
-        movl $AUDIT_ARCH_I386,%edi      /* 1st arg: audit arch */
+        movl %esi,%r8d                  /* 5th arg: 4th syscall arg */
+        movl %ecx,%r9d                  /*swap with edx*/
+        movl %edx,%ecx                  /* 4th arg: 3rd syscall arg */
+        movl %r9d,%edx                  /* 3rd arg: 2nd syscall arg */
+        movl %ebx,%esi                  /* 2nd arg: 1st syscall arg */
+        movl %eax,%edi                  /* 1st arg: syscall number */
         call __audit_syscall_entry
         movl RAX-ARGOFFSET(%rsp),%eax   /* reload syscall number */
         cmpq $(IA32_NR_syscalls-1),%rax
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 0d0c9d4ab6d5..f9e3fabc8716 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -449,12 +449,11 @@ sysenter_audit:
         jnz syscall_trace_entry
         addl $4,%esp
         CFI_ADJUST_CFA_OFFSET -4
-        /* %esi already in 8(%esp)         6th arg: 4th syscall arg */
-        /* %edx already in 4(%esp)         5th arg: 3rd syscall arg */
-        /* %ecx already in 0(%esp)         4th arg: 2nd syscall arg */
-        movl %ebx,%ecx                  /* 3rd arg: 1st syscall arg */
-        movl %eax,%edx                  /* 2nd arg: syscall number */
-        movl $AUDIT_ARCH_I386,%eax      /* 1st arg: audit arch */
+        movl %esi,4(%esp)               /* 5th arg: 4th syscall arg */
+        movl %edx,(%esp)                /* 4th arg: 3rd syscall arg */
+        /* %ecx already in %ecx            3rd arg: 2nd syscall arg */
+        movl %ebx,%edx                  /* 2nd arg: 1st syscall arg */
+        /* %eax already in %eax            1st arg: syscall number */
         call __audit_syscall_entry
         pushl_cfi %ebx
         movl PT_EAX(%esp),%eax          /* reload syscall number */
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index c844f0816ab8..5e8cb2ad9fb3 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -488,12 +488,11 @@ badsys:
          * jump back to the normal fast path.
          */
 auditsys:
-        movq %r10,%r9                   /* 6th arg: 4th syscall arg */
-        movq %rdx,%r8                   /* 5th arg: 3rd syscall arg */
-        movq %rsi,%rcx                  /* 4th arg: 2nd syscall arg */
-        movq %rdi,%rdx                  /* 3rd arg: 1st syscall arg */
-        movq %rax,%rsi                  /* 2nd arg: syscall number */
-        movl $AUDIT_ARCH_X86_64,%edi    /* 1st arg: audit arch */
+        movq %r10,%r8                   /* 5th arg: 4th syscall arg */
+        movq %rdx,%rcx                  /* 4th arg: 3rd syscall arg */
+        movq %rsi,%rdx                  /* 3rd arg: 2nd syscall arg */
+        movq %rdi,%rsi                  /* 2nd arg: 1st syscall arg */
+        movq %rax,%rdi                  /* 1st arg: syscall number */
         call __audit_syscall_entry
         LOAD_ARGS 0             /* reload call-clobbered registers */
         jmp system_call_fastpath