Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x86/x86 Oops, forgot to revert this patch too... th...



details:   https://anonhg.NetBSD.org/src/rev/c5bb6646ee87
branches:  trunk
changeset: 772479:c5bb6646ee87
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Thu Jan 05 17:18:02 2012 +0000

description:
Oops, forgot to revert this patch too... thanks Greg for finding it :-/

diffstat:

 sys/arch/x86/x86/syscall.c |  30 ++----------------------------
 1 files changed, 2 insertions(+), 28 deletions(-)

diffs (51 lines):

diff -r a76ff65a6576 -r c5bb6646ee87 sys/arch/x86/x86/syscall.c
--- a/sys/arch/x86/x86/syscall.c        Thu Jan 05 16:18:00 2012 +0000
+++ b/sys/arch/x86/x86/syscall.c        Thu Jan 05 17:18:02 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: syscall.c,v 1.6 2011/12/20 15:41:50 reinoud Exp $      */
+/*     $NetBSD: syscall.c,v 1.7 2012/01/05 17:18:02 reinoud Exp $      */
 
 /*-
  * Copyright (c) 1998, 2000, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.6 2011/12/20 15:41:50 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.7 2012/01/05 17:18:02 reinoud Exp $");
 
 #include "opt_sa.h"
 
@@ -129,32 +129,6 @@
         */
        rip_call = X86_TF_RIP(frame) - frame->tf_err;
 
-       /* are we allowed to execute system calls in this memory space? */
-       if (p->p_flag & PK_CHKNOSYSCALL) {
-               map = &(p->p_vmspace->vm_map);
-               vm_map_lock(map);
-
-               if (uvm_map_checkattr(map, rip_call, rip_call + frame->tf_err,
-                                       MAP_NOSYSCALLS)) {
-                       ksiginfo_t ksi;
-
-                       vm_map_unlock(map);
-                       X86_TF_RIP(frame) = rip_call;
-
-                       /* treat as illegal instruction */
-                       KSI_INIT_TRAP(&ksi);
-                       ksi.ksi_signo = SIGILL;
-                       ksi.ksi_code = ILL_ILLTRP;
-                       ksi.ksi_addr = (void *) X86_TF_RIP(frame);
-                       ksi.ksi_trap = 0; /* XXX ? */
-                       trapsignal(l, &ksi);
-                       userret(l);
-                       return;
-               }
-
-               vm_map_unlock(map);
-       }
-
        code = X86_TF_RAX(frame) & (SYS_NSYSENT - 1);
        callp = p->p_emul->e_sysent + code;
 



Home | Main Index | Thread Index | Old Index