2 files changed, 10 insertions, 7 deletions

diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86.c
index f51c894a7da5..aee14fafd13d 100644
--- a/arch/i386/kernel/vm86.c
+++ b/arch/i386/kernel/vm86.c
@@ -43,6 +43,7 @@
 #include <linux/smp_lock.h>
 #include <linux/highmem.h>
 #include <linux/ptrace.h>
+#include <linux/audit.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -252,6 +253,7 @@ out:
 static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk)
 {
         struct tss_struct *tss;
+        long eax;
 /*
  * make sure the vm86() system call doesn't try to do anything silly
  */
@@ -305,13 +307,19 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
         tsk->thread.screen_bitmap = info->screen_bitmap;
         if (info->flags & VM86_SCREEN_BITMAP)
                 mark_screen_rdonly(tsk->mm);
+        __asm__ __volatile__("xorl %eax,%eax; movl %eax,%fs; movl %eax,%gs\n\t");
+        __asm__ __volatile__("movl %%eax, %0\n" :"=r"(eax));
+
+        /*call audit_syscall_exit since we do not exit via the normal paths */
+        if (unlikely(current->audit_context))
+                audit_syscall_exit(current, AUDITSC_RESULT(eax), eax);
+
         __asm__ __volatile__(
-                "xorl %%eax,%%eax; movl %%eax,%%fs; movl %%eax,%%gs\n\t"
                 "movl %0,%%esp\n\t"
                 "movl %1,%%ebp\n\t"
                 "jmp resume_userspace"
                 : /* no outputs */
-                :"r" (&info->regs), "r" (task_thread_info(tsk)) : "ax");
+                :"r" (&info->regs), "r" (task_thread_info(tsk)));
         /* we never return here */
 }
 
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index d7e7e637b92a..cfaa4a277f08 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -966,11 +966,6 @@ void audit_syscall_entry(struct task_struct *tsk, int arch, int major,
         if (context->in_syscall) {
                 struct audit_context *newctx;
 
-#if defined(__NR_vm86) && defined(__NR_vm86old)
-                /* vm86 mode should only be entered once */
-                if (major == __NR_vm86 || major == __NR_vm86old)
-                        return;
-#endif
 #if AUDIT_DEBUG
                 printk(KERN_ERR
                        "audit(:%d) pid=%d in syscall=%d;"